Changeset 149


Ignore:
Timestamp:
Jun 19, 2005 12:27:29 PM (15 years ago)
Author:
forrest
Message:

minor fixes

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/CbcBranchActual.cpp

    r135 r149  
    968968  : CbcSimpleInteger(model,sequence,iColumn)
    969969{
    970   downPseudoCost_ = downPseudoCost;
    971   upPseudoCost_ = upPseudoCost;
     970  downPseudoCost_ = CoinMax(1.0e-10,downPseudoCost);
     971  upPseudoCost_ = CoinMax(1.0e-10,upPseudoCost);
    972972  breakEven_ = upPseudoCost_/(upPseudoCost_+downPseudoCost_);
    973973  method_=0;
  • trunk/CbcBranchCut.cpp

    r135 r149  
    371371// Creates a branching object
    372372CbcBranchingObject *
    373 CbcBranchToFixLots::createBranch(int way) const
     373CbcBranchToFixLots::createBranch(int way)
    374374{
    375375  // by default way must be -1
  • trunk/include/CbcBranchCut.hpp

    r129 r149  
    195195
    196196  /// Creates a branching object
    197   virtual CbcBranchingObject * createBranch(int way) const;
     197  virtual CbcBranchingObject * createBranch(int way);
    198198
    199199
Note: See TracChangeset for help on using the changeset viewer.