Changeset 1058

Timestamp:

Sep 5, 2008 11:52:14 AM (13 years ago)

Author:

forrest

Message:

allow pivot and fix or randomized rounding

Location:

trunk/Cbc/src

Files:

• CbcHeuristicPivotAndFix.cpp (modified) (1 diff)
• CbcSolver.cpp (modified) (6 diffs)

trunk/Cbc/src/CbcHeuristicPivotAndFix.cpp

@@ -82 +82 @@
 
   numCouldRun_++;
+  printf("entered pivot and fix\n");
   int returnCode = 0;
   return returnCode;

trunk/Cbc/src/CbcSolver.cpp

@@ -157 +157 @@
 #include "CbcHeuristic.hpp"
 #include "CbcHeuristicLocal.hpp"
+#include "CbcHeuristicPivotAndFix.hpp"
+#include "CbcHeuristicRandRound.hpp"
 #include "CbcHeuristicGreedy.hpp"
 #include "CbcHeuristicFPump.hpp"
@@ -508 +510 @@
   parameters_[whichParam(GREEDY,numberParameters_,parameters_)].setCurrentOption("on");
   parameters_[whichParam(COMBINE,numberParameters_,parameters_)].setCurrentOption("on");
+  parameters_[whichParam(PIVOTANDFIX,numberParameters_,parameters_)].setCurrentOption("off");
+  parameters_[whichParam(RANDROUND,numberParameters_,parameters_)].setCurrentOption("off");
   parameters_[whichParam(RINS,numberParameters_,parameters_)].setCurrentOption("off");
   parameters_[whichParam(DINS,numberParameters_,parameters_)].setCurrentOption("off");
@@ -3209 +3213 @@
   parameters[whichParam(GREEDY,numberParameters,parameters)].setCurrentOption("on");
   parameters[whichParam(COMBINE,numberParameters,parameters)].setCurrentOption("on");
+  parameters[whichParam(PIVOTANDFIX,numberParameters,parameters)].setCurrentOption("off");
+  parameters[whichParam(RANDROUND,numberParameters,parameters)].setCurrentOption("off");
   parameters[whichParam(RINS,numberParameters,parameters)].setCurrentOption("off");
   parameters[whichParam(DINS,numberParameters,parameters)].setCurrentOption("off");
@@ -3237 +3243 @@
   int useGreedy = parameters_[whichParam(GREEDY,numberParameters_,parameters_)].currentOptionAsInteger();
   int useCombine = parameters_[whichParam(COMBINE,numberParameters_,parameters_)].currentOptionAsInteger();
+  int usePivot = parameters_[whichParam(PIVOTANDFIX,numberParameters_,parameters_)].currentOptionAsInteger();
+  int useRand = parameters_[whichParam(RANDROUND,numberParameters_,parameters_)].currentOptionAsInteger();
   int useRINS = parameters_[whichParam(RINS,numberParameters_,parameters_)].currentOptionAsInteger();
   int useRENS = parameters_[whichParam(RENS,numberParameters_,parameters_)].currentOptionAsInteger();
@@ -3482 +3490 @@
       model->addHeuristic(&heuristicDP) ;
     }
+    anyToDo=true;
+  }
+  if (usePivot>=type) {
+    CbcHeuristicPivotAndFix heuristic(*model);
+    heuristic.setHeuristicName("pivot and fix");
+    heuristic.setFractionSmall(10.0); // normally 0.5
+    model->addHeuristic(&heuristic);
+    anyToDo=true;
+  }
+  if (useRand>=type) {
+    CbcHeuristicRandRound heuristic(*model);
+    heuristic.setHeuristicName("randomized rounding");
+    heuristic.setFractionSmall(10.0); // normally 0.5
+    model->addHeuristic(&heuristic);
     anyToDo=true;
   }
@@ -4804 +4826 @@
             case DIVINGV:
             case COMBINE:
+            case PIVOTANDFIX:
+            case RANDROUND:
             case LOCALTREE:
               defaultSettings=false; // user knows what she is doing