Changeset 132


Ignore:
Timestamp:
May 12, 2005 12:01:01 PM (16 years ago)
Author:
forrest
Message:

correct external iteration count

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/CbcModel.cpp

    r131 r132  
    31693169  {
    31703170    solver_->resolve() ;
    3171     numberIterations_ += getIterationCount() ;
     3171    numberIterations_ += solver_->getIterationCount() ;
    31723172    feasible = (solver_->isProvenOptimal() &&
    31733173                !solver_->isDualObjectiveLimitReached()) ; }
     
    31813181      solver_->resolve();
    31823182      solver_->setHintParam(OsiDoDualInResolve,saveTakeHint,saveStrength);
    3183       numberIterations_ += getIterationCount() ;
     3183      numberIterations_ += solver_->getIterationCount() ;
    31843184      feasible = solver_->isProvenOptimal();
    31853185    }
  • trunk/include/CbcModel.hpp

    r122 r132  
    575575    /// Get how many iterations it took to solve the problem.
    576576    int getIterationCount() const
    577     { return solver_->getIterationCount();};
     577    { return numberIterations_;};
    578578    /// Get how many Nodes it took to solve the problem.
    579579    int getNodeCount() const
Note: See TracChangeset for help on using the changeset viewer.