@@ -3263,16 +3263,16 @@ SCIP_RETCODE readSolFile(
3263
3263
lineno ++ ;
3264
3264
3265
3265
/* there are some lines which may precede the solution information */
3266
- if ( SCIPstrncasecmp (buffer , "solution status:" , 16 ) == 0 || SCIPstrncasecmp (buffer , "objective value:" , 16 ) == 0 ||
3267
- SCIPstrncasecmp (buffer , "Log started" , 11 ) == 0 || SCIPstrncasecmp (buffer , "Variable Name " , 13 ) == 0 ||
3268
- SCIPstrncasecmp (buffer , "All other variables " , 19 ) == 0 || strspn (buffer , " \n\r\t\f" ) == strlen ( buffer ) ||
3269
- SCIPstrncasecmp (buffer , "NAME" , 4 ) == 0 || SCIPstrncasecmp (buffer , "ENDATA" , 6 ) == 0 || /* allow parsing of SOL-format on the MIPLIB 2003 pages */
3270
- SCIPstrncasecmp (buffer , "=obj=" , 5 ) == 0 ) /* avoid "unknown variable" warning when reading MIPLIB SOL files */
3266
+ if ( SCIPstrncasecmp (buffer , "solution status:" , 16 ) == 0 || SCIPstrncasecmp (buffer , "objective value:" , 16 ) == 0
3267
+ || buffer [ strspn (buffer , " \t\n\v\f\r" )] == '\0' || SCIPstrncasecmp (buffer , "Log started " , 11 ) == 0
3268
+ || SCIPstrncasecmp (buffer , "Variable Name " , 13 ) == 0 || SCIPstrncasecmp (buffer , "All other variables" , 19 ) == 0
3269
+ || SCIPstrncasecmp (buffer , "NAME" , 4 ) == 0 || SCIPstrncasecmp (buffer , "ENDATA" , 6 ) == 0 /* allow parsing of SOL-format on the MIPLIB 2003 pages */
3270
+ || SCIPstrncasecmp (buffer , "=obj=" , 5 ) == 0 ) /* avoid "unknown variable" warning when reading MIPLIB SOL files */
3271
3271
continue ;
3272
3272
3273
3273
/* tokenize the line */
3274
- varname = SCIPstrtok (buffer , " \t" , & endptr );
3275
- valuestring = SCIPstrtok (NULL , " \t" , & endptr );
3274
+ varname = SCIPstrtok (buffer , " \t\v " , & endptr );
3275
+ valuestring = SCIPstrtok (NULL , " \t\n\v\f\r " , & endptr );
3276
3276
if ( valuestring == NULL )
3277
3277
{
3278
3278
SCIPerrorMessage ("Invalid input line %d in solution file <%s>: <%s>.\n" , lineno , filename , buffer );
0 commit comments