Changeset 404 for branches/devel

Timestamp:

Jul 9, 2006 9:50:11 AM (15 years ago)

Author:

forrest

Message:

for infeasible problems

Location:

branches/devel/Cbc/src

Files:

• CbcModel.cpp (modified) (1 diff)
• CbcStrategy.cpp (modified) (2 diffs)

branches/devel/Cbc/src/CbcModel.cpp

@@ -1936 +1936 @@
 */
   globalCuts_= OsiCuts() ;
+  if (!bestSolution_) {
+    // make sure lp solver is infeasible
+    int numberColumns = solver_->getNumCols();
+    const double * columnLower = solver_->getColLower();
+    int iColumn;
+    for (iColumn=0;iColumn<numberColumns;iColumn++) {
+      if (solver_->isInteger(iColumn)) 
+        solver_->setColUpper(iColumn,columnLower[iColumn]);
+    }
+    solver_->initialSolve();
+  }
   if (strategy_&&strategy_->preProcessState()>0) {
     // undo preprocessing

branches/devel/Cbc/src/CbcStrategy.cpp

@@ -299 +299 @@
     // solver_ should have been cloned outside
     CglPreProcess * process = new CglPreProcess();
+    // Pass in models message handler
+    process->passInMessageHandler(model.messageHandler());
     OsiSolverInterface * solver = model.solver();
     int logLevel = model.messageHandler()->logLevel();
@@ -325 +327 @@
     generator1.setRowCuts(3);
     //generator1.messageHandler()->setLogLevel(logLevel);
-    process->messageHandler()->setLogLevel(logLevel);
+    // Not needed with pass in process->messageHandler()->setLogLevel(logLevel);
     // Add in generators
     process->addCutGenerator(&generator1);