Changeset 1877 for trunk/Cbc


Ignore:
Timestamp:
Mar 22, 2013 10:24:12 AM (6 years ago)
Author:
forrest
Message:

fix bug in parallel

Location:
trunk/Cbc/src
Files:
2 edited

Legend:

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

    r1839 r1877  
    288288      hash_[i] = rhs.hash_[i];
    289289    }
    290     for (int i=0;i<size_;i++) {
     290    for (int i=0;i<numberCuts_;i++) {
    291291      if (rhs.rowCut_[i])
    292292        rowCut_[i]=new OsiRowCut2(*rhs.rowCut_[i]);
     
    318318        hash_[i] = rhs.hash_[i];
    319319      }
    320       for (int i=0;i<size_;i++) {
     320      for (int i=0;i<numberCuts_;i++) {
    321321        if (rhs.rowCut_[i])
    322322          rowCut_[i]=new OsiRowCut2(*rhs.rowCut_[i]);
  • trunk/Cbc/src/CbcThread.cpp

    r1854 r1877  
    13931393        setCutoff(baseModel->getCutoff());
    13941394        bestObjective_ = baseModel->bestObjective_;
    1395         assert (!baseModel->globalCuts_.sizeRowCuts());
     1395        //assert (!baseModel->globalCuts_.sizeRowCuts());
    13961396        if (numberSolutions_ < baseModel->numberSolutions_) {
    13971397          assert (baseModel->bestSolution_);
     
    15691569        setCutoff(baseModel->getCutoff());
    15701570        bestObjective_ = baseModel->bestObjective_;
    1571         assert (!baseModel->globalCuts_.sizeRowCuts());
     1571        //assert (!baseModel->globalCuts_.sizeRowCuts());
    15721572        numberSolutions_ = baseModel->numberSolutions_;
    15731573        assert (usedInSolution_);
Note: See TracChangeset for help on using the changeset viewer.