Changeset 249 for trunk


Ignore:
Timestamp:
Feb 15, 2006 10:04:51 AM (14 years ago)
Author:
forrest
Message:

tiny

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/CbcCutGenerator.cpp

    r238 r249  
    214214        }
    215215      }
    216       returnCode = !solver->basisIsAvailable();
     216      //returnCode = !solver->basisIsAvailable();
    217217    }
    218218    if (timing_)
  • trunk/CbcModel.cpp

    r246 r249  
    33893389  maximumCutPassesAtRoot_(20),
    33903390  maximumCutPasses_(10),
     3391  currentPassNumber_(0),
    33913392  maximumWhich_(1000),
    33923393  whichGenerator_(NULL),
     
    35033504  maximumCutPassesAtRoot_(20),
    35043505  maximumCutPasses_(10),
     3506  currentPassNumber_(0),
    35053507  maximumWhich_(1000),
    35063508  whichGenerator_(NULL),
     
    36913693  maximumCutPassesAtRoot_(rhs.maximumCutPassesAtRoot_),
    36923694  maximumCutPasses_( rhs.maximumCutPasses_),
     3695  currentPassNumber_(rhs.currentPassNumber_),
    36933696  maximumWhich_(rhs.maximumWhich_),
    36943697  whichGenerator_(NULL),
     
    39613964    maximumCutPassesAtRoot_ = rhs.maximumCutPassesAtRoot_;
    39623965    maximumCutPasses_ = rhs.maximumCutPasses_;
     3966    currentPassNumber_ = rhs.currentPassNumber_;
    39633967    intParam_[CbcMaxNumNode] = rhs.intParam_[CbcMaxNumNode];
    39643968    intParam_[CbcMaxNumSol] = rhs.intParam_[CbcMaxNumSol];
     
    46754679  double tolerance;
    46764680  solver_->getDblParam(OsiDualTolerance,tolerance) ;
    4677   gap += tolerance;
    46784681  if (gap<=0.0)
    46794682    return 0;
     4683  gap += 100.0*tolerance;
    46804684  double integerTolerance = getDblParam(CbcIntegerTolerance) ;
    46814685
Note: See TracChangeset for help on using the changeset viewer.