Changeset 2152
- Timestamp:
- Mar 5, 2015 10:13:54 AM (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Cbc/src/CbcSolver.cpp
r2144 r2152 8216 8216 iColumn = -1; 8217 8217 int lowestPriority=-COIN_INT_MAX; 8218 while (iColumn>=0 || fgets(line, 1000, fp)) { 8219 if (!strncmp(line, "ENDATA", 6)) 8218 bool needCard = true; 8219 while (!needCard || fgets(line, 1000, fp)) { 8220 if (!strncmp(line, "ENDATA", 6)|| 8221 !strncmp(line, "endata", 6)) 8220 8222 break; 8221 8223 nLine++; 8222 if (!useMasks) 8224 if (!useMasks) 8223 8225 iColumn = -1; 8226 else 8227 needCard=false; 8224 8228 double up = 0.0; 8225 8229 double down = 0.0; … … 8283 8287 } 8284 8288 } 8285 if (iColumn == numberColumns) 8289 if (iColumn == numberColumns) { 8286 8290 iColumn = -1; 8291 needCard = true; 8292 } 8287 8293 break; 8288 8294 // number
Note: See TracChangeset
for help on using the changeset viewer.