Changeset 1781 for stable/2.7


Ignore:
Timestamp:
May 23, 2012 9:23:48 AM (7 years ago)
Author:
forrest
Message:

fix over zealous setting of final cutoff

Location:
stable/2.7/Cbc/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/2.7/Cbc/src/CbcModel.cpp

    r1779 r1781  
    41974197    if (bestSolution_ && (solverCharacteristics_->solverType() < 2 || solverCharacteristics_->solverType() == 4)) {
    41984198        setCutoff(1.0e50) ; // As best solution should be worse than cutoff
     4199        // also in continuousSolver_
     4200        if (continuousSolver_) {
     4201          // Solvers know about direction
     4202          double direction = solver_->getObjSense();
     4203          continuousSolver_->setDblParam(OsiDualObjectiveLimit, 1.0e50*direction);
     4204        }
    41994205        phase_ = 5;
    42004206        double increment = getDblParam(CbcModel::CbcCutoffIncrement) ;
  • stable/2.7/Cbc/src/CbcSolver.cpp

    r1779 r1781  
    61506150                                if (!iStat && !iStat2 && !bestSolution)
    61516151                                    iStat2 = 8;
     6152                                if (!iStat && iStat2==1 && bestSolution)
     6153                                  iStat2 = 0; // solution and search completed
    61526154                                statistics_seconds = time2 - time1;
    61536155                                statistics_sys_seconds = CoinSysTime();
Note: See TracChangeset for help on using the changeset viewer.