Changeset 900 for stable/2.0

Timestamp:

Mar 17, 2008 10:15:09 AM (13 years ago)

Author:

forrest

Message:

fix bug noted by Francois

Location:

stable/2.0/Cbc/src

Files:

• CbcBranchActual.cpp (modified) (1 diff)
• CbcModel.cpp (modified) (2 diffs)

stable/2.0/Cbc/src/CbcBranchActual.cpp

@@ -1150 +1150 @@
                                                         double downPseudoCost, double upPseudoCost)
 {
-  CbcSimpleIntegerPseudoCost(model,iColumn,downPseudoCost,upPseudoCost);
+  *this=CbcSimpleIntegerPseudoCost(model,iColumn,downPseudoCost,upPseudoCost);
   columnNumber_=iColumn;
 }

stable/2.0/Cbc/src/CbcModel.cpp

@@ -6947 +6947 @@
       int priority = obj1->priority();
       int preferredWay = obj1->preferredWay();
-      delete object_[iObject];
       double costValue = CoinMax(1.0e-5,fabs(cost[iColumn]));
       // treat as if will cost what it says up
@@ -6957 +6956 @@
         downCost=obj1a->downPseudoCost();
       }
+      delete object_[iObject];
       CbcSimpleIntegerDynamicPseudoCost * newObject =
         new CbcSimpleIntegerDynamicPseudoCost(this,iColumn,1.0e0*downCost,1.0e0*upCost);