Changeset 616

Timestamp:

Jun 4, 2007 4:53:44 AM (13 years ago)

Author:

forrest

Message:

exit a bit earlier on easy models

File:

• branches/devel/Cbc/src/CbcModel.cpp (modified) (4 diffs)

branches/devel/Cbc/src/CbcModel.cpp

@@ -902 +902 @@
      int value=131072;
      clpSolver->setSpecialOptions(clpSolver->specialOptions()|value);
-     simplex->setSpecialOptions(simplex->specialOptions()|value);
+     if ((clpSolver->specialOptions()&value)!=0)
+       simplex->setSpecialOptions(simplex->specialOptions()|value);
      //if (simplex->numberRows()<50)
      //simplex->setAlphaAccuracy(1.0);
@@ -1056 +1057 @@
   }
   currentNumberCuts_ = numberNewCuts_ ;
+  // See if can stop on gap
+  stoppedOnGap_ = false ;
+  bestPossibleObjective_ = solver_->getObjValue()*solver_->getObjSense();
+  double testGap = CoinMax(dblParam_[CbcAllowableGap],
+                           CoinMax(fabs(bestObjective_),fabs(bestPossibleObjective_))
+                           *dblParam_[CbcAllowableFractionGap]);
+  if (bestObjective_-bestPossibleObjective_ < testGap && getCutoffIncrement()>=0.0) {
+    if (bestPossibleObjective_<getCutoff()) {
+      stoppedOnGap_ = true ;
+      messageHandler()->message(CBC_GAP,messages())
+        << bestObjective_-bestPossibleObjective_
+        << dblParam_[CbcAllowableGap]
+        << dblParam_[CbcAllowableFractionGap]*100.0
+        << CoinMessageEol ;
+      secondaryStatus_ = 2;
+    }
+    feasible = false;
+  }
 /*
   We've taken the continuous relaxation as far as we can. Time to branch.
@@ -1222 +1241 @@
     for (i = 0;i < numberObjects_;i++)
       object_[i]->resetBounds(solver_) ; }
-  stoppedOnGap_ = false ;
 /*
   Feasible? Then we should have either a live node prepped for future
@@ -1957 +1975 @@
       else
       { 
-        tree_->cleanTree(this,-COIN_DBL_MAX,bestPossibleObjective_) ;
+        if (tree_->size())
+          tree_->cleanTree(this,-COIN_DBL_MAX,bestPossibleObjective_) ;
         delete nextRowCut_;
         // We need to get rid of node if is has already been popped from tree