Changeset 94

Timestamp:

Mar 29, 2005 4:41:31 PM (16 years ago)

Author:

forrest

Message:

correct branch cut handling

Location:

trunk

Files:

• CbcModel.cpp (modified) (2 diffs)
• include/CbcModel.hpp (modified) (1 diff)

trunk/CbcModel.cpp

@@ -3057 +3057 @@
       while (!addedCuts_[oldCutIndex]) oldCutIndex++ ;
       assert(oldCutIndex < currentNumberCuts_) ;
-      if (status == CoinWarmStartBasis::basic)
+      // always leave if from nextRowCut_
+      if (status == CoinWarmStartBasis::basic&&
+          addedCuts_[oldCutIndex]->effectiveness()!=COIN_DBL_MAX)
       { solverCutIndices[numberOldToDelete++] = i+firstOldCut ;
         if (addedCuts_[oldCutIndex]->decrement() == 0)
@@ -5152 +5154 @@
 { 
   nextRowCut_=new OsiRowCut(cut);
+  nextRowCut_->setEffectiveness(COIN_DBL_MAX); // mark so will always stay
 }
 /* Process root node and return a strengthened model

trunk/include/CbcModel.hpp

@@ -1258 +1258 @@
       After use it should be set to NULL.
   */
-  const OsiRowCut * nextRowCut_;
+  OsiRowCut * nextRowCut_;
 
   /// Current node so can be used elsewhere