Changeset 391 for trunk/Cbc/src/CbcModel.cpp

Timestamp:

Jun 29, 2006 10:44:34 AM (14 years ago)

Author:

forrest

Message:

for ampl and version

File:

• trunk/Cbc/src/CbcModel.cpp (modified) (2 diffs)

trunk/Cbc/src/CbcModel.cpp

@@ -428 +428 @@
         // allow for cliques etc
         nOrig = CoinMax(nOrig,originalColumns[numberColumns-1]+1);
+        // try and redo debugger
+        OsiRowCutDebugger * debugger = const_cast<OsiRowCutDebugger *> (solver_->getRowCutDebuggerAlways());
+        if (debugger)
+          debugger->redoSolution(numberColumns,originalColumns);
         originalObject = object_;
         // object number or -1
@@ -521 +525 @@
         if (!numberObjects_)
           handler_->message(CBC_NOINT,messages_) << CoinMessageEol ;
+      } else {
+        int numberColumns = getNumCols();
+        CglPreProcess * process = strategy_->process();
+        assert (process);
+        const int * originalColumns = process->originalColumns();
+        // try and redo debugger
+        OsiRowCutDebugger * debugger = const_cast<OsiRowCutDebugger *> (solver_->getRowCutDebuggerAlways());
+        if (debugger)
+          debugger->redoSolution(numberColumns,originalColumns);
       }
     } else {