Changeset 1244 for trunk/Clp


Ignore:
Timestamp:
Jul 18, 2008 3:41:05 PM (12 years ago)
Author:
forrest
Message:

allow more iterations in primal

File:
1 edited

Legend:

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

    r1243 r1244  
    54385438    // Allow for catastrophe
    54395439    int saveMax = intParam_[ClpMaxNumIteration];
    5440     if (intParam_[ClpMaxNumIteration]>100000+numberIterations_&&numberIterations_)
    5441       intParam_[ClpMaxNumIteration] = numberIterations_ + 1000 + 2*numberRows_+numberColumns_;
     5440    if (numberIterations_) {
     5441      // normal
     5442      if (intParam_[ClpMaxNumIteration]>100000+numberIterations_)
     5443        intParam_[ClpMaxNumIteration]
     5444          = numberIterations_ + 1000 + 2*numberRows_+numberColumns_;
     5445    } else {
     5446      // Not normal allow more
     5447      baseIteration_ += 2*(numberRows_+numberColumns_);
     5448    }
    54425449    // check which algorithms allowed
    54435450    int dummy;
Note: See TracChangeset for help on using the changeset viewer.