Ignore:
Timestamp:
Aug 1, 2013 4:39:21 AM (6 years ago)
Author:
forrest
Message:

try and fix thread problem and fix nextbestsolution counter

File:
1 edited

Legend:

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

    r1943 r1949  
    14201420        bestObjective_ = baseModel->bestObjective_;
    14211421        //assert (!baseModel->globalCuts_.sizeRowCuts());
    1422         if (numberSolutions_ < baseModel->numberSolutions_) {
    1423           assert (baseModel->bestSolution_);
     1422        if (numberSolutions_ < baseModel->numberSolutions_&& baseModel->bestSolution_) {
    14241423          int numberColumns = solver_->getNumCols();
    14251424          if (!bestSolution_)
Note: See TracChangeset for help on using the changeset viewer.