Changeset 960


Ignore:
Timestamp:
Jun 2, 2008 6:26:14 AM (11 years ago)
Author:
forrest
Message:

maximization reporting bug

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

Legend:

Unmodified
Added
Removed
  • stable/2.1/Cbc/src/CbcSolver.cpp

    r957 r960  
    723723      int numberColumns = babModel_->getNumCols();
    724724      if (babModel_->bestSolution())
    725         model_.setBestSolution(babModel_->bestSolution(),numberColumns,babModel_->getObjValue());
     725        model_.setBestSolution(babModel_->bestSolution(),numberColumns,babModel_->getMinimizationObjValue());
    726726      OsiClpSolverInterface * clpSolver1 = dynamic_cast< OsiClpSolverInterface*> (babModel_->solver());
    727727      ClpSimplex * lpSolver1 = clpSolver1->getModelPtr();
     
    73487348#ifndef NEW_STYLE_SOLVER
    73497349                if (returnMode==1)
    7350                   model_.setBestSolution(bestSolution,n,babModel_->getObjValue());
    7351 #endif
    7352                 babModel_->setBestSolution(bestSolution,n,babModel_->getObjValue());
     7350                  model_.setBestSolution(bestSolution,n,babModel_->getMinimizationObjValue());
     7351#endif
     7352                babModel_->setBestSolution(bestSolution,n,babModel_->getMinimizationObjValue());
    73537353#ifndef NEW_STYLE_SOLVER
    73547354                // and put back in very original solver
  • stable/2.1/Cbc/src/unitTestClp.cpp

    r861 r960  
    124124    // 0 for no test, 1 for some, 2 for many, 3 for all
    125125    //PUSH_MPS("blend2",274,353,7.598985,6.9156751140,7);
     126    //PUSH_MPS("egout",98,141,568.101,149.589,7);
    126127#define HOWMANY 2
    127128#if HOWMANY
Note: See TracChangeset for help on using the changeset viewer.