Changeset 979


Ignore:
Timestamp:
Jun 13, 2008 5:38:48 AM (11 years ago)
Author:
forrest
Message:

best obj fix

Location:
trunk/Cbc/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/CbcModel.cpp

    r964 r979  
    34193419        totalTime < dblParam_[CbcMaximumSeconds] &&
    34203420        !stoppedOnGap_&&!eventHappened_)) {
    3421       if (tree_->size())
    3422         tree_->cleanTree(this,-COIN_DBL_MAX,bestPossibleObjective_) ;
     3421      if (tree_->size()) {
     3422        double dummyBest;
     3423        tree_->cleanTree(this,-COIN_DBL_MAX,dummyBest) ;
     3424      }
    34233425      delete nextRowCut_;
    34243426      if (stoppedOnGap_)
  • trunk/Cbc/src/CbcSolver.cpp

    r961 r979  
    58525852                  generator1.setMaxElementsRoot(200);
    58535853                  generator1.setMaxLookRoot(50);
    5854                   generator1.setMaxLookRoot(123);
     5854                  if (saveSolver->getNumCols()>3000)
     5855                    generator1.setMaxProbeRoot(123);
    58555856                  generator1.setRowCuts(3);
    58565857                  if ((tunePreProcess&1)!=0) {
Note: See TracChangeset for help on using the changeset viewer.