Changeset 2153

Timestamp:

Mar 5, 2015 10:14:44 AM (4 years ago)

Author:

forrest

Message:

fix priorityin file

File:

• stable/2.9/Cbc/src/CbcSolver.cpp (modified) (3 diffs)

stable/2.9/Cbc/src/CbcSolver.cpp

@@ -4245 +4245 @@
                                     OsiClpSolverInterface * clpSolver2 = dynamic_cast< OsiClpSolverInterface*> (solver2);
                                     ClpSimplex * lpSolver = clpSolver2->getModelPtr();
-                                    lpSolver->writeMps("presolved.mps", 0, 1, lpSolver->optimizationDirection());
+                                    lpSolver->writeMps("presolved.mps", 2, 1, lpSolver->optimizationDirection());
                                     printf("Preprocessed model (minimization) on presolved.mps\n");
                                 }
@@ -8216 +8216 @@
                                         iColumn = -1;
                                         int lowestPriority=-COIN_INT_MAX;
-                                        while (iColumn>=0 || fgets(line, 1000, fp)) {
-                                            if (!strncmp(line, "ENDATA", 6))
+                                        bool needCard = true;
+                                        while (!needCard || fgets(line, 1000, fp)) {
+                                            if (!strncmp(line, "ENDATA", 6)||
+                                                !strncmp(line, "endata", 6))
                                                 break;
                                             nLine++;
-                                            if (!useMasks)
+                                            if (!useMasks) 
                                               iColumn = -1;
+                                            else
+                                              needCard=false;
                                             double up = 0.0;
                                             double down = 0.0;
@@ -8283 +8287 @@
                                                       }
                                                     }
-                                                    if (iColumn == numberColumns)
+                                                    if (iColumn == numberColumns) {
                                                         iColumn = -1;
+                                                        needCard = true;
+                                                    }
                                                     break;
                                                     // number