Changeset 1681

Timestamp:

Jun 29, 2011 3:43:11 AM (10 years ago)

Author:

forrest

Message:

change from ifdef COIN_HAS_BONMIB to runtime test

File:

• stable/2.7/Cbc/src/CbcModel.cpp (modified) (8 diffs)

stable/2.7/Cbc/src/CbcModel.cpp

@@ -2396 +2396 @@
     if (numberObjects_)
         doHeuristicsAtRoot();
-#ifdef COIN_HAS_BONMIN // With some heuristics solver needs a resolve here (don't know if this is bug in heuristics)
-    solver_->resolve();
-    if(!isProvenOptimal()){
-      solver_->initialSolve();
-    }
-#endif
+    if (solverCharacteristics_->solutionAddsCuts()) {
+      // With some heuristics solver needs a resolve here (don't know if this is bug in heuristics)
+      solver_->resolve();
+      if(!isProvenOptimal()){
+        solver_->initialSolve();
+      }
+    }
     /*
       Grepping through the code, it would appear that this is a command line
@@ -2413 +2414 @@
     stoppedOnGap_ = false ;
     // See if can stop on gap
-#ifdef COIN_HAS_BONMIN // With some heuristics solver needs a resolve here (don't know if this is bug in heuristics)
-    solver_->resolve();
-    if(!isProvenOptimal()){
-      solver_->initialSolve();
-    }
-#endif
+    if (solverCharacteristics_->solutionAddsCuts()) {
+      // With some heuristics solver needs a resolve here (don't know if this is bug in heuristics)
+      solver_->resolve();
+      if(!isProvenOptimal()){
+        solver_->initialSolve();
+      }
+    }
     bestPossibleObjective_ = solver_->getObjValue() * solver_->getObjSense();
     double testGap = CoinMax(dblParam_[CbcAllowableGap],
@@ -7105 +7107 @@
             << CoinMessageEol ;
         }
-#ifdef COIN_HAS_BONMIN  //Is Necessary for Bonmin? Always keepGoing if cuts have been generated in last iteration (taken from similar code in Cbc-2.4)
-        if (solverCharacteristics_->solutionAddsCuts()&&numberViolated) { 
-          for (i = 0;i<numberCutGenerators_;i++) { 
-            if (generator_[i]->mustCallAgain()) { 
-              keepGoing=true; // say must go round 
-              break; 
-            } 
-          } 
-        } 
+        //Is Necessary for Bonmin? Always keepGoing if cuts have been generated in last iteration (taken from similar code in Cbc-2.4)
+        if (solverCharacteristics_->solutionAddsCuts()&&numberViolated) { 
+          for (i = 0;i<numberCutGenerators_;i++) { 
+            if (generator_[i]->mustCallAgain()) { 
+              keepGoing=true; // say must go round 
+              break; 
+            } 
+          } 
+        } 
         if(!keepGoing){
-#endif
-        // Status for single pass of cut generation
-        int status = 0;
-        /*
-          threadMode with bit 2^1 set indicates we should use threads for root cut
-          generation.
-        */
-        if ((threadMode_&2) == 0 || numberNodes_) {
+          // Status for single pass of cut generation
+          int status = 0;
+          /*
+            threadMode with bit 2^1 set indicates we should use threads for root cut
+            generation.
+          */
+          if ((threadMode_&2) == 0 || numberNodes_) {
             status = serialCuts(theseCuts, node, slackCuts, lastNumberCuts);
-        } else {
+          } else {
             // do cuts independently
 #ifdef CBC_THREAD
             status = parallelCuts(master, theseCuts, node, slackCuts, lastNumberCuts);
 #endif
-        }
-        // Do we need feasible and violated?
-        feasible = (status >= 0);
-        if (status == 1)
+          }
+          // Do we need feasible and violated?
+          feasible = (status >= 0);
+          if (status == 1)
             keepGoing = true;
-        else if (status == 2)
+          else if (status == 2)
             numberTries = 0;
-        if (!feasible)
+          if (!feasible)
             violated = -2;
-#ifdef COIN_HAS_BONMIN  //Is Necessary for Bonmin? Always keepGoing if cuts have been generated in last iteration (taken from similar code in Cbc-2.4)
-        }
-#endif
+        }
         //if (!feasible)
         //break;
@@ -12595 +12594 @@
 #endif
     currentNode_ = newNode; // so can be used elsewhere
-#ifdef COIN_HAS_BONMIN // Remember number of rows to restore at the end of the loop
-    int saveNumberRows=solver_->getNumRows();
-#endif
     /*
       Enough preparation. Get down to the business of choosing a branching
       variable.
     */
-#ifdef COIN_HAS_BONMIN // Remember number of rows to restore at the end of the loop
     int saveNumberRows=solver_->getNumRows();
-#endif
     while (anyAction == -1) {
         // Set objective value (not so obvious if NLP etc)
@@ -12694 +12688 @@
             resolve(solver_);
             double objval = solver_->getObjValue();
-#ifndef COIN_HAS_BONMIN
-            int saveNumberRows = solver_->getNumRows();
-#endif
             lastHeuristic_ = NULL;
             setBestSolution(CBC_SOLUTION, objval,
@@ -12714 +12705 @@
                 feasible = false; // pretend infeasible
             }
-#ifndef COIN_HAS_BONMIN
-            if( saveNumberRows<solver_->getNumRows()) {
-                // delete rows - but leave solution
-                int n = solver_->getNumRows();
-                int * del = new int [n-saveNumberRows];
-                for (int i=saveNumberRows;i<n;i++)
-                    del[i-saveNumberRows]=i;
-                solver_->deleteRows(n-saveNumberRows,del);
-                delete [] del;
-            }
-#endif
             if (feasible)
                 anyAction = -1;
@@ -12765 +12745 @@
         }
     }
-#ifdef COIN_HAS_BONMIN //A candidate has been found; restore the subproblem.
     if( saveNumberRows<solver_->getNumRows()) {
         // delete rows - but leave solution
@@ -12775 +12754 @@
         delete [] del;
     }
-#endif
     /*
       End main loop to choose a branching variable.