Changeset 900 for stable/2.0/Cbc


Ignore:
Timestamp:
Mar 17, 2008 10:15:09 AM (12 years ago)
Author:
forrest
Message:

fix bug noted by Francois

Location:
stable/2.0/Cbc/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/2.0/Cbc/src/CbcBranchActual.cpp

    r720 r900  
    11501150                                                        double downPseudoCost, double upPseudoCost)
    11511151{
    1152   CbcSimpleIntegerPseudoCost(model,iColumn,downPseudoCost,upPseudoCost);
     1152  *this=CbcSimpleIntegerPseudoCost(model,iColumn,downPseudoCost,upPseudoCost);
    11531153  columnNumber_=iColumn;
    11541154}
  • stable/2.0/Cbc/src/CbcModel.cpp

    r851 r900  
    69476947      int priority = obj1->priority();
    69486948      int preferredWay = obj1->preferredWay();
    6949       delete object_[iObject];
    69506949      double costValue = CoinMax(1.0e-5,fabs(cost[iColumn]));
    69516950      // treat as if will cost what it says up
     
    69576956        downCost=obj1a->downPseudoCost();
    69586957      }
     6958      delete object_[iObject];
    69596959      CbcSimpleIntegerDynamicPseudoCost * newObject =
    69606960        new CbcSimpleIntegerDynamicPseudoCost(this,iColumn,1.0e0*downCost,1.0e0*upCost);
Note: See TracChangeset for help on using the changeset viewer.