Changeset 625
 Timestamp:
 Jun 13, 2007 12:25:55 PM (13 years ago)
 Location:
 branches/devel/Cbc/src
 Files:

 2 edited
Legend:
 Unmodified
 Added
 Removed

branches/devel/Cbc/src/CbcHeuristicFPump.cpp
r594 r625 367 367 memcpy(newSolution,solution,numberColumns*sizeof(double)); 368 368 int flip; 369 returnCode = rounds( newSolution,saveObjective,numberIntegers,integerVariable,369 returnCode = rounds(solver,newSolution,saveObjective,numberIntegers,integerVariable, 370 370 roundExpensive_,defaultRounding_,&flip); 371 371 if (returnCode) { … … 531 531 memcpy(newSolution,solution,numberColumns*sizeof(double)); 532 532 int flip; 533 returnCode = rounds( newSolution,saveObjective,numberIntegers,integerVariable,533 returnCode = rounds(solver,newSolution,saveObjective,numberIntegers,integerVariable, 534 534 roundExpensive_,defaultRounding_,&flip); 535 535 if (returnCode) { … … 854 854 */ 855 855 int 856 CbcHeuristicFPump::rounds( double * solution,856 CbcHeuristicFPump::rounds(OsiSolverInterface * solver,double * solution, 857 857 const double * objective, 858 858 int numberIntegers, const int * integerVariable, 859 859 bool roundExpensive, double downValue, int *flip) 860 860 { 861 OsiSolverInterface * solver = model_>solver();862 861 double integerTolerance = model_>getDblParam(CbcModel::CbcIntegerTolerance); 863 862 double primalTolerance ; 
branches/devel/Cbc/src/CbcHeuristicFPump.hpp
r502 r625 163 163 returns 0 if current is solution 164 164 */ 165 int rounds( double * solution, const double * objective,165 int rounds(OsiSolverInterface * solver,double * solution, const double * objective, 166 166 int numberIntegers, const int * integerVariable, 167 167 bool roundExpensive=false,
Note: See TracChangeset
for help on using the changeset viewer.