Changeset 625 for branches


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

modify feasibility pump

Location:
branches/devel/Cbc/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Cbc/src/CbcHeuristicFPump.cpp

    r594 r625  
    367367      memcpy(newSolution,solution,numberColumns*sizeof(double));
    368368      int flip;
    369       returnCode = rounds(newSolution,saveObjective,numberIntegers,integerVariable,
     369      returnCode = rounds(solver,newSolution,saveObjective,numberIntegers,integerVariable,
    370370                          roundExpensive_,defaultRounding_,&flip);
    371371      if (returnCode) {
     
    531531          memcpy(newSolution,solution,numberColumns*sizeof(double));
    532532          int flip;
    533           returnCode = rounds(newSolution,saveObjective,numberIntegers,integerVariable,
     533          returnCode = rounds(solver,newSolution,saveObjective,numberIntegers,integerVariable,
    534534                              roundExpensive_,defaultRounding_,&flip);
    535535          if (returnCode) {
     
    854854*/
    855855int
    856 CbcHeuristicFPump::rounds(double * solution,
     856CbcHeuristicFPump::rounds(OsiSolverInterface * solver,double * solution,
    857857                          const double * objective,
    858858                          int numberIntegers, const int * integerVariable,
    859859                          bool roundExpensive, double downValue, int *flip)
    860860{
    861   OsiSolverInterface * solver = model_->solver();
    862861  double integerTolerance = model_->getDblParam(CbcModel::CbcIntegerTolerance);
    863862  double primalTolerance ;
  • branches/devel/Cbc/src/CbcHeuristicFPump.hpp

    r502 r625  
    163163      returns 0 if current is solution
    164164  */
    165   int rounds(double * solution, const double * objective,
     165  int rounds(OsiSolverInterface * solver,double * solution, const double * objective,
    166166             int numberIntegers, const int * integerVariable,
    167167             bool roundExpensive=false,
Note: See TracChangeset for help on using the changeset viewer.