Changeset 94


Ignore:
Timestamp:
Mar 29, 2005 4:41:31 PM (16 years ago)
Author:
forrest
Message:

correct branch cut handling

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/CbcModel.cpp

    r84 r94  
    30573057      while (!addedCuts_[oldCutIndex]) oldCutIndex++ ;
    30583058      assert(oldCutIndex < currentNumberCuts_) ;
    3059       if (status == CoinWarmStartBasis::basic)
     3059      // always leave if from nextRowCut_
     3060      if (status == CoinWarmStartBasis::basic&&
     3061          addedCuts_[oldCutIndex]->effectiveness()!=COIN_DBL_MAX)
    30603062      { solverCutIndices[numberOldToDelete++] = i+firstOldCut ;
    30613063        if (addedCuts_[oldCutIndex]->decrement() == 0)
     
    51525154{
    51535155  nextRowCut_=new OsiRowCut(cut);
     5156  nextRowCut_->setEffectiveness(COIN_DBL_MAX); // mark so will always stay
    51545157}
    51555158/* Process root node and return a strengthened model
  • trunk/include/CbcModel.hpp

    r66 r94  
    12581258      After use it should be set to NULL.
    12591259  */
    1260   const OsiRowCut * nextRowCut_;
     1260  OsiRowCut * nextRowCut_;
    12611261
    12621262  /// Current node so can be used elsewhere
Note: See TracChangeset for help on using the changeset viewer.