Changeset 2011 for stable/2.8


Ignore:
Timestamp:
Mar 6, 2014 3:16:10 PM (6 years ago)
Author:
forrest
Message:

fix minor stuff like provenoptimal

File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/2.8/Cbc/src/CbcModel.cpp

    r2002 r2011  
    50345034    originalContinuousObjective_ = solver_->getObjValue() * solver_->getObjSense();
    50355035    bestPossibleObjective_ = originalContinuousObjective_;
     5036    if (solver_->isProvenDualInfeasible())
     5037      originalContinuousObjective_ = -COIN_DBL_MAX;
    50365038    delete [] continuousSolution_;
    50375039    continuousSolution_ = CoinCopyOfArray(solver_->getColSolution(),
     
    65766578CbcModel::isProvenInfeasible() const
    65776579{
    6578     if (!status_ && bestObjective_ >= 1.0e30)
     6580  if (!status_ && (bestObjective_ >= 1.0e30  && !secondaryStatus_))
    65796581        return true;
    65806582    else
     
    1310913111{
    1311013112    if (status_ != -1) {
    13111         return originalContinuousObjective_ < 1.0e50;
     13113        return fabs(originalContinuousObjective_) < 1.0e50;
    1311213114    } else {
    1311313115        return solver_->isProvenOptimal();
     
    1686916871    bool hitMaxTime = (totalTime >= maxSeconds);
    1687016872    if (parentModel_ && !hitMaxTime) {
    16871         // In a sub tree so need to add both times
    16872         totalTime += parentModel_->getCurrentSeconds();
     16873        // In a sub tree
     16874        assert (parentModel_);
    1687316875        maxSeconds = parentModel_->getMaximumSeconds();
    1687416876        hitMaxTime = (totalTime >= maxSeconds);
Note: See TracChangeset for help on using the changeset viewer.