Changeset 614 for branches/devel/Cbc/src/CbcSolver.cpp

Timestamp:

May 17, 2007 9:55:22 AM (14 years ago)

Author:

forrest

Message:

names had got lost

File:

• branches/devel/Cbc/src/CbcSolver.cpp (modified) (3 diffs)

branches/devel/Cbc/src/CbcSolver.cpp

@@ -4016 +4016 @@
                       }
                       solver3->setCbcModel(babModel);
-                      babModel->addCutGenerator(&stored,1,"Stored");
+                      if (stored.sizeRowCuts()) 
+                        babModel->addCutGenerator(&stored,1,"Stored");
                       CglTemporary temp;
                       babModel->addCutGenerator(&temp,1,"OnceOnly");
@@ -4028 +4029 @@
                       OsiSolverLink * solver3 = dynamic_cast<OsiSolverLink *> (babModel->solver());
                       assert (solver3) ;
+                      int extra1 = parameters[whichParam(EXTRA1,numberParameters,parameters)].intValue();
+                      solver3->setBiLinearPriority(extra1);
+                      printf("bilinear priority now %d\n",extra1);
                       double * solution = solver3->heuristicSolution(slpValue>0 ? slpValue : 20 ,1.0e-5,testOsiOptions-10);
                       assert(solution);
@@ -4606 +4610 @@
                 int status;
                 ClpSimplex * lpSolver = clpSolver->getModelPtr();
-                if (!gmpl)
+                if (!gmpl) {
                   status =clpSolver->readMps(fileName.c_str(),
                                                  keepImportNames!=0,
                                                  allowImportErrors!=0);
+                  if (!status||(status>0&&allowImportErrors)) {
+                    if (keepImportNames) {
+                      lengthName = lpSolver->lengthNames();
+                      rowNames = *(lpSolver->rowNames());
+                      columnNames = *(lpSolver->columnNames());
+                    } else {
+                      lengthName=0;
+                    }
+                  }
+                }
                 else if (gmpl>0)
                   status= lpSolver->readGMPL(fileName.c_str(),