Changeset 1865

Timestamp:

Jan 31, 2013 5:19:46 AM (8 years ago)

Author:

forrest

Message:

cuts off when user asks for them off

Location:

stable/2.8/Cbc/src

Files:

• CbcHeuristic.cpp (modified) (1 diff)
• CbcSolver.cpp (modified) (2 diffs)

stable/2.8/Cbc/src/CbcHeuristic.cpp

@@ -993 +993 @@
                     model_->solver()->getHintParam(OsiDoReducePrint, takeHint, strength);
                     model.solver()->setHintParam(OsiDoReducePrint, takeHint, strength);
-                    CbcStrategyDefault strategy(1, model_->numberStrong(),
-                                                model_->numberBeforeTrust());
+                    // no cut generators if none in parent
+                    CbcStrategyDefault 
+                      strategy(model_->numberCutGenerators() ? 1 : -1, 
+                               model_->numberStrong(),
+                               model_->numberBeforeTrust());
                     // Set up pre-processing - no
                     strategy.setupPreProcessing(0); // was (4);

stable/2.8/Cbc/src/CbcSolver.cpp

@@ -2135 +2135 @@
                                     initialPumpTune = 1003;
                                     iParam = whichParam(CLP_PARAM_INT_PROCESSTUNE, numberParameters_, parameters_);
-                                    parameters_[iParam].setIntValue(-1);
+                                    parameters_[iParam].setIntValue(0);
                                     tunePreProcess = 0;
                                     iParam = whichParam(CBC_PARAM_STR_DIVINGC, numberParameters_, parameters_);
@@ -2142 +2142 @@
                                     parameters_[iParam].setCurrentOption("off");
                                     iParam = whichParam(CBC_PARAM_STR_PROBINGCUTS, numberParameters_, parameters_);
-                                    parameters_[iParam].setCurrentOption("on");
-                                    probingAction = 1;
+                                    // but not if cuts off
+                                    int jParam = whichParam(CBC_PARAM_STR_CUTSSTRATEGY, numberParameters_, parameters_);
+                                    
+                                    jParam = parameters_[jParam].currentOptionAsInteger();
+                                    if (jParam) {
+                                      parameters_[iParam].setCurrentOption("on");
+                                      probingAction = 1;
+                                    } else {
+                                      parameters_[iParam].setCurrentOption("off");
+                                      probingAction = 0;
+                                    }
                                 }
                             }