Changeset 278 for trunk


Ignore:
Timestamp:
Mar 17, 2006 8:30:30 AM (14 years ago)
Author:
forrest
Message:

for timing

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/CbcModel.cpp

    r277 r278  
    10341034      messageHandler()->message(CBC_STATUS,messages())
    10351035        << numberNodes_<< nNodes<< bestObjective_<< bestPossibleObjective_
     1036        <<getCurrentSeconds()
    10361037        << CoinMessageEol ;
    10371038# ifdef CBC_ONLY_CLP
     
    15651566    bestPossibleObjective_=bestObjective_;
    15661567    handler_->message(CBC_END_GOOD,messages_)
    1567       << bestObjective_ << numberIterations_ << numberNodes_
     1568      << bestObjective_ << numberIterations_ << numberNodes_<<getCurrentSeconds()
    15681569      << CoinMessageEol ;
    15691570  } else {
    15701571    handler_->message(CBC_END,messages_)
    15711572      << bestObjective_ <<bestPossibleObjective_
    1572       << numberIterations_ << numberNodes_
     1573      << numberIterations_ << numberNodes_<<getCurrentSeconds()
    15731574      << CoinMessageEol ;
    15741575  }
     
    17641765    double increment = getDblParam(CbcModel::CbcCutoffIncrement) ;
    17651766    bestObjective_ += 100.0*increment+1.0e-3;
    1766     setBestSolution(CBC_SOLUTION,bestObjective_,bestSolution_,true) ;
     1767    setBestSolution(CBC_END_SOLUTION,bestObjective_,bestSolution_,true) ;
    17671768    continuousSolver_->resolve() ;
    17681769    if (!continuousSolver_->isProvenOptimal())
     
    57955796      handler_->message(how,messages_)
    57965797        <<bestObjective_<<numberIterations_
    5797         <<numberNodes_
     5798        <<numberNodes_<<getCurrentSeconds()
    57985799        <<CoinMessageEol;
    57995800      /*
     
    75527553  thisNode->setObjectiveValue(newObjValue);
    75537554}
     7555// Current time since start of branchAndbound
     7556double
     7557CbcModel::getCurrentSeconds() const {
     7558  return CoinCpuTime()-getDblParam(CbcStartSeconds);
     7559}
Note: See TracChangeset for help on using the changeset viewer.