Changeset 1738


Ignore:
Timestamp:
Nov 24, 2010 3:42:58 PM (9 years ago)
Author:
pbonami
Message:

Return false sometime in newSolution

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/split/Bonmin/src/CbcBonmin/BonDiver.cpp

    r1736 r1738  
    800800    std::cout<<"Found "<<model->getSolutionCount()<<" solutions"<<std::endl;
    801801#endif
    802     if (diver_->getComparisonMode() == CbcDfsDiver::Enlarge)
     802    bool r_value = false;
     803    if (diver_->getComparisonMode() == CbcDfsDiver::Enlarge){
    803804      diver_->setComparisonMode(CbcDfsDiver::FindSolutions);
     805      r_value = true;}
    804806    if (model->getSolutionCount() >= numberSolToStopDive_ && diver_->getComparisonMode() == CbcDfsDiver::FindSolutions) {
    805807      diver_->setComparisonMode(CbcDfsDiver::CloseBound);
    806     }
    807     return true;
     808      r_value = true;
     809    }
     810    return r_value;
    808811  }
    809812
Note: See TracChangeset for help on using the changeset viewer.