Changeset 844 for stable/2.0/Cbc/src/CbcNode.cpp

Timestamp:

Dec 20, 2007 7:20:12 AM (13 years ago)

Author:

forrest

Message:

make useSolution work better

File:

• stable/2.0/Cbc/src/CbcNode.cpp (modified) (2 diffs)

stable/2.0/Cbc/src/CbcNode.cpp

@@ -1177 +1177 @@
   int numberObjects = model->numberObjects();
   bool checkFeasibility = numberObjects>model->numberIntegers();
-  int maximumStrong = CoinMax(CoinMin(model->numberStrong(),numberObjects),1);
+  int maximumStrong = CoinMax(CoinMin(numberStrong,numberObjects),1);
   int numberColumns = model->getNumCols();
   double * saveUpper = new double[numberColumns];
@@ -2155 +2155 @@
   else
     depth_ = 0;
+  // Go to other choose if hot start
+  if (model->hotstartSolution()) 
+    return -3;
   delete branch_;
   branch_=NULL;