Changeset 1865
- Timestamp:
- Jan 31, 2013 5:19:46 AM (8 years ago)
- Location:
- stable/2.8/Cbc/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
stable/2.8/Cbc/src/CbcHeuristic.cpp
r1843 r1865 993 993 model_->solver()->getHintParam(OsiDoReducePrint, takeHint, strength); 994 994 model.solver()->setHintParam(OsiDoReducePrint, takeHint, strength); 995 CbcStrategyDefault strategy(1, model_->numberStrong(), 996 model_->numberBeforeTrust()); 995 // no cut generators if none in parent 996 CbcStrategyDefault 997 strategy(model_->numberCutGenerators() ? 1 : -1, 998 model_->numberStrong(), 999 model_->numberBeforeTrust()); 997 1000 // Set up pre-processing - no 998 1001 strategy.setupPreProcessing(0); // was (4); -
stable/2.8/Cbc/src/CbcSolver.cpp
r1854 r1865 2135 2135 initialPumpTune = 1003; 2136 2136 iParam = whichParam(CLP_PARAM_INT_PROCESSTUNE, numberParameters_, parameters_); 2137 parameters_[iParam].setIntValue( -1);2137 parameters_[iParam].setIntValue(0); 2138 2138 tunePreProcess = 0; 2139 2139 iParam = whichParam(CBC_PARAM_STR_DIVINGC, numberParameters_, parameters_); … … 2142 2142 parameters_[iParam].setCurrentOption("off"); 2143 2143 iParam = whichParam(CBC_PARAM_STR_PROBINGCUTS, numberParameters_, parameters_); 2144 parameters_[iParam].setCurrentOption("on"); 2145 probingAction = 1; 2144 // but not if cuts off 2145 int jParam = whichParam(CBC_PARAM_STR_CUTSSTRATEGY, numberParameters_, parameters_); 2146 2147 jParam = parameters_[jParam].currentOptionAsInteger(); 2148 if (jParam) { 2149 parameters_[iParam].setCurrentOption("on"); 2150 probingAction = 1; 2151 } else { 2152 parameters_[iParam].setCurrentOption("off"); 2153 probingAction = 0; 2154 } 2146 2155 } 2147 2156 }
Note: See TracChangeset
for help on using the changeset viewer.