Changeset 1949 for trunk/Cbc


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

try and fix thread problem and fix nextbestsolution counter

Location:
trunk/Cbc/src
Files:
2 edited

Legend:

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

    r1945 r1949  
    1651816518            usedInSolution_[i] = 0;
    1651916519        }
    16520         baseModel->numberSolutions_++;
    1652116520        if (bestObjective_ < baseModel->bestObjective_ && bestObjective_ < baseModel->getCutoff()) {
    1652216521            baseModel->bestObjective_ = bestObjective_ ;
     
    1652716526            baseModel->setCutoff(getCutoff());
    1652816527        }
     16528        baseModel->numberSolutions_++;
    1652916529        unlockThread();
    1653016530    }
     
    1692716927    }
    1692816928    savedSolutions_[numberSavedSolutions_]=NULL;
    16929     --numberSavedSolutions_;
    1693016929  }
    1693116930}
  • 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.