Changeset 626


Ignore:
Timestamp:
Jun 13, 2007 12:30:49 PM (12 years ago)
Author:
forrest
Message:

to fix abort

Location:
trunk/Cbc/src
Files:
2 edited

Legend:

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

    r581 r626  
    185185    memcpy(newSolution,solution,numberColumns*sizeof(double));
    186186    int flip;
    187     returnCode = rounds(newSolution,saveObjective,roundExpensive_,downValue_,&flip);
     187    returnCode = rounds(solver,newSolution,saveObjective,roundExpensive_,downValue_,&flip);
    188188    if (returnCode) {
    189189      // SOLUTION IS INTEGER
     
    322322*/
    323323int
    324 CbcHeuristicFPump::rounds(double * solution,
     324CbcHeuristicFPump::rounds(OsiSolverInterface * solver, double * solution,
    325325                          const double * objective,
    326326                          bool roundExpensive, double downValue, int *flip)
    327327{
    328   OsiSolverInterface * solver = model_->solver();
    329328  double integerTolerance = model_->getDblParam(CbcModel::CbcIntegerTolerance);
    330329  double primalTolerance ;
  • trunk/Cbc/src/CbcHeuristicFPump.hpp

    r356 r626  
    7979      returns 0 if current is solution
    8080  */
    81   int rounds(double * solution, const double * objective,
     81  int rounds(OsiSolverInterface * solver, double * solution, const double * objective,
    8282             bool roundExpensive=false,
    8383             double downValue=0.5, int *flip=0);
Note: See TracChangeset for help on using the changeset viewer.