Changeset 1058
- Timestamp:
- Sep 5, 2008 11:52:14 AM (10 years ago)
- Location:
- trunk/Cbc/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Cbc/src/CbcHeuristicPivotAndFix.cpp
r1055 r1058 82 82 83 83 numCouldRun_++; 84 printf("entered pivot and fix\n"); 84 85 int returnCode = 0; 85 86 return returnCode; -
trunk/Cbc/src/CbcSolver.cpp
r1053 r1058 157 157 #include "CbcHeuristic.hpp" 158 158 #include "CbcHeuristicLocal.hpp" 159 #include "CbcHeuristicPivotAndFix.hpp" 160 #include "CbcHeuristicRandRound.hpp" 159 161 #include "CbcHeuristicGreedy.hpp" 160 162 #include "CbcHeuristicFPump.hpp" … … 508 510 parameters_[whichParam(GREEDY,numberParameters_,parameters_)].setCurrentOption("on"); 509 511 parameters_[whichParam(COMBINE,numberParameters_,parameters_)].setCurrentOption("on"); 512 parameters_[whichParam(PIVOTANDFIX,numberParameters_,parameters_)].setCurrentOption("off"); 513 parameters_[whichParam(RANDROUND,numberParameters_,parameters_)].setCurrentOption("off"); 510 514 parameters_[whichParam(RINS,numberParameters_,parameters_)].setCurrentOption("off"); 511 515 parameters_[whichParam(DINS,numberParameters_,parameters_)].setCurrentOption("off"); … … 3209 3213 parameters[whichParam(GREEDY,numberParameters,parameters)].setCurrentOption("on"); 3210 3214 parameters[whichParam(COMBINE,numberParameters,parameters)].setCurrentOption("on"); 3215 parameters[whichParam(PIVOTANDFIX,numberParameters,parameters)].setCurrentOption("off"); 3216 parameters[whichParam(RANDROUND,numberParameters,parameters)].setCurrentOption("off"); 3211 3217 parameters[whichParam(RINS,numberParameters,parameters)].setCurrentOption("off"); 3212 3218 parameters[whichParam(DINS,numberParameters,parameters)].setCurrentOption("off"); … … 3237 3243 int useGreedy = parameters_[whichParam(GREEDY,numberParameters_,parameters_)].currentOptionAsInteger(); 3238 3244 int useCombine = parameters_[whichParam(COMBINE,numberParameters_,parameters_)].currentOptionAsInteger(); 3245 int usePivot = parameters_[whichParam(PIVOTANDFIX,numberParameters_,parameters_)].currentOptionAsInteger(); 3246 int useRand = parameters_[whichParam(RANDROUND,numberParameters_,parameters_)].currentOptionAsInteger(); 3239 3247 int useRINS = parameters_[whichParam(RINS,numberParameters_,parameters_)].currentOptionAsInteger(); 3240 3248 int useRENS = parameters_[whichParam(RENS,numberParameters_,parameters_)].currentOptionAsInteger(); … … 3482 3490 model->addHeuristic(&heuristicDP) ; 3483 3491 } 3492 anyToDo=true; 3493 } 3494 if (usePivot>=type) { 3495 CbcHeuristicPivotAndFix heuristic(*model); 3496 heuristic.setHeuristicName("pivot and fix"); 3497 heuristic.setFractionSmall(10.0); // normally 0.5 3498 model->addHeuristic(&heuristic); 3499 anyToDo=true; 3500 } 3501 if (useRand>=type) { 3502 CbcHeuristicRandRound heuristic(*model); 3503 heuristic.setHeuristicName("randomized rounding"); 3504 heuristic.setFractionSmall(10.0); // normally 0.5 3505 model->addHeuristic(&heuristic); 3484 3506 anyToDo=true; 3485 3507 } … … 4804 4826 case DIVINGV: 4805 4827 case COMBINE: 4828 case PIVOTANDFIX: 4829 case RANDROUND: 4806 4830 case LOCALTREE: 4807 4831 defaultSettings=false; // user knows what she is doing
Note: See TracChangeset
for help on using the changeset viewer.