Changeset 900 for stable/2.0
- Timestamp:
- Mar 17, 2008 10:15:09 AM (13 years ago)
- Location:
- stable/2.0/Cbc/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
stable/2.0/Cbc/src/CbcBranchActual.cpp
r720 r900 1150 1150 double downPseudoCost, double upPseudoCost) 1151 1151 { 1152 CbcSimpleIntegerPseudoCost(model,iColumn,downPseudoCost,upPseudoCost);1152 *this=CbcSimpleIntegerPseudoCost(model,iColumn,downPseudoCost,upPseudoCost); 1153 1153 columnNumber_=iColumn; 1154 1154 } -
stable/2.0/Cbc/src/CbcModel.cpp
r851 r900 6947 6947 int priority = obj1->priority(); 6948 6948 int preferredWay = obj1->preferredWay(); 6949 delete object_[iObject];6950 6949 double costValue = CoinMax(1.0e-5,fabs(cost[iColumn])); 6951 6950 // treat as if will cost what it says up … … 6957 6956 downCost=obj1a->downPseudoCost(); 6958 6957 } 6958 delete object_[iObject]; 6959 6959 CbcSimpleIntegerDynamicPseudoCost * newObject = 6960 6960 new CbcSimpleIntegerDynamicPseudoCost(this,iColumn,1.0e0*downCost,1.0e0*upCost);
Note: See TracChangeset
for help on using the changeset viewer.