Ignore:
Timestamp:
Jan 16, 2013 1:41:25 PM (7 years ago)
Author:
forrest
Message:

multiple root solvers, stronger strong branching and cutoff as constraint

File:
1 edited

Legend:

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

    r1822 r1839  
    10671067
    10681068  numCouldRun_++;
    1069   if (!model_->bestSolution())
    1070     return 0; // odd - because in parallel mode
    10711069  int nodeCount = model_->getNodeCount();
    10721070  if (numberSolutions_ == model_->getSolutionCount())
    10731071    return 0;
     1072  if (!model_->bestSolution())
     1073    return 0; // odd - because in parallel mode
    10741074  numberSolutions_ = model_->getSolutionCount();
    10751075  lastRunDeep_ = nodeCount;
     
    13421342        }
    13431343    }
    1344     // Now fix all integers as close to zero if zero or large cost
     1344    // Now fix all integers as close to zero if not zero or large cost
    13451345    int nFix = 0;
    13461346    for (i = 0; i < numberIntegers; i++) {
Note: See TracChangeset for help on using the changeset viewer.