Ignore:
Timestamp:
Oct 8, 2006 7:33:47 PM (13 years ago)
Author:
forrest
Message:

towards common use with other solvers

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Cbc/src/CbcBranchLotsize.cpp

    r356 r439  
    642642 */
    643643void
    644 CbcLotsize::resetBounds()
    645 {
    646   //printf("resetBounds needs coding for CbcLotSize\n");
     644CbcLotsize::resetBounds(const OsiSolverInterface * solver)
     645{
    647646}
    648647
     
    679678  :CbcBranchingObject(model,variable,way,lowerValue)
    680679{
    681   numberBranchesLeft_=1;
     680  setNumberBranchesLeft(1);
    682681  down_[0] = lowerValue;
    683682  down_[1] = upperValue;
     
    731730*/
    732731double
    733 CbcLotsizeBranchingObject::branch(bool normalBranch)
    734 {
    735   if (model_->messageHandler()->logLevel()>2&&normalBranch)
    736     print(normalBranch);
    737   numberBranchesLeft_--;
     732CbcLotsizeBranchingObject::branch()
     733{
     734  decrementNumberBranchesLeft();
    738735  int iColumn = variable_;
    739736  if (way_<0) {
     
    764761// Print
    765762void
    766 CbcLotsizeBranchingObject::print(bool normalBranch)
     763CbcLotsizeBranchingObject::print()
    767764{
    768765  int iColumn = variable_;
Note: See TracChangeset for help on using the changeset viewer.