Ignore:
Timestamp:
Jun 8, 2012 11:15:10 AM (7 years ago)
Author:
stefan
Message:

merge r1790 from stable/2.7 (correct message if iterlim reached) and introduce secondaryStatus 8 for stop at iteration limit

Location:
trunk/Cbc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc

  • trunk/Cbc/src/CbcModel.cpp

    r1784 r1791  
    39183918    */
    39193919    if (!(numberNodes_ < intParam_[CbcMaxNumNode] &&
    3920             numberSolutions_ < intParam_[CbcMaxNumSol] &&
    3921             !maximumSecondsReached() &&
    3922             !stoppedOnGap_ && !eventHappened_ && (maximumNumberIterations_ < 0 ||
    3923                                                   numberIterations_ < maximumNumberIterations_))) {
     3920          numberSolutions_ < intParam_[CbcMaxNumSol] &&
     3921          !maximumSecondsReached() &&
     3922          !stoppedOnGap_ &&
     3923          !eventHappened_ &&
     3924          (maximumNumberIterations_ < 0 || numberIterations_ < maximumNumberIterations_))
     3925         ) {
    39243926        if (tree_->size()) {
    39253927            double dummyBest;
     
    39533955            secondaryStatus_ = 3;
    39543956            status_ = 1 ;
     3957        } else if (maximumNumberIterations_ >= 0 && numberIterations_ >= maximumNumberIterations_) {
     3958            handler_->message(CBC_MAXITERS, messages_) << CoinMessageEol ;
     3959            secondaryStatus_ = 8;
     3960            status_ = 1 ;
    39553961        } else {
     3962            assert(numberSolutions_ >= intParam_[CbcMaxNumSol]);
    39563963            handler_->message(CBC_MAXSOLS, messages_) << CoinMessageEol ;
    39573964            secondaryStatus_ = 6;
Note: See TracChangeset for help on using the changeset viewer.