Ignore:
Timestamp:
Aug 3, 2007 12:00:53 PM (13 years ago)
Author:
forrest
Message:

for secondary status on time

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/src/ClpModel.cpp

    r1056 r1060  
    23282328  // replaced - compiler error? bool hitMax= (numberIterations_>=maximumIterations());
    23292329  bool hitMax = (numberIterations_ >= intParam_[ClpMaxNumIteration]);
    2330   if (dblParam_[ClpMaxSeconds]>=0.0&&!hitMax)
     2330  if (dblParam_[ClpMaxSeconds]>=0.0&&!hitMax) {
    23312331    hitMax = (CoinCpuTime()>=dblParam_[ClpMaxSeconds]);
     2332  }
    23322333  return hitMax;
     2334}
     2335// On stopped - sets secondary status
     2336void
     2337ClpModel::onStopped()
     2338{
     2339  if (problemStatus_==3) {
     2340    secondaryStatus_=0;
     2341    if (CoinCpuTime()>=dblParam_[ClpMaxSeconds])
     2342      secondaryStatus_=9;
     2343  }
    23332344}
    23342345// Pass in Message handler (not deleted at end)
Note: See TracChangeset for help on using the changeset viewer.