Changeset 1780


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

to print out saying optimal in more cases

Location:
trunk/Cbc/src
Files:
2 edited

Legend:

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

    r1778 r1780  
    41854185    if (bestSolution_ && (solverCharacteristics_->solverType() < 2 || solverCharacteristics_->solverType() == 4)) {
    41864186        setCutoff(1.0e50) ; // As best solution should be worse than cutoff
     4187        // also in continuousSolver_
     4188        if (continuousSolver_) {
     4189          // Solvers know about direction
     4190          double direction = solver_->getObjSense();
     4191          continuousSolver_->setDblParam(OsiDualObjectiveLimit, 1.0e50*direction);
     4192        }
    41874193        phase_ = 5;
    41884194        double increment = getDblParam(CbcModel::CbcCutoffIncrement) ;
  • trunk/Cbc/src/CbcSolver.cpp

    r1778 r1780  
    62126212                                if (!iStat && !iStat2 && !bestSolution)
    62136213                                    iStat2 = 8;
     6214                                if (!iStat && iStat2==1 && bestSolution)
     6215                                  iStat2 = 0; // solution and search completed
    62146216                                statistics_seconds = time2 - time1;
    62156217                                statistics_sys_seconds = CoinSysTime();
Note: See TracChangeset for help on using the changeset viewer.