Changeset 1784 for trunk/Cbc/src


Ignore:
Timestamp:
Jun 6, 2012 9:37:27 AM (7 years ago)
Author:
stefan
Message:

merge chgset 1783 from stable/2.6

Location:
trunk/Cbc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc

  • trunk/Cbc/src/CbcModel.cpp

    r1780 r1784  
    39273927        }
    39283928        delete nextRowCut_;
     3929        /* order is important here:
     3930         * maximumSecondsReached() should be checked before eventHappened_ and
     3931         * isNodeLimitReached() should be checked after eventHappened_
     3932         * reason is, that at timelimit, eventHappened_ is set to true to make Cbc stop fast
     3933         *   and if Ctrl+C is hit, then the nodelimit is set to -1 to make Cbc stop
     3934         */
    39293935        if (stoppedOnGap_) {
    39303936            messageHandler()->message(CBC_GAP, messages())
     
    39353941            secondaryStatus_ = 2;
    39363942            status_ = 0 ;
     3943        } else if (maximumSecondsReached()) {
     3944            handler_->message(CBC_MAXTIME, messages_) << CoinMessageEol ;
     3945            secondaryStatus_ = 4;
     3946            status_ = 1 ;
    39373947        } else if (eventHappened_) {
    39383948            handler_->message(CBC_EVENT, messages_) << CoinMessageEol ;
     
    39423952            handler_->message(CBC_MAXNODES, messages_) << CoinMessageEol ;
    39433953            secondaryStatus_ = 3;
    3944             status_ = 1 ;
    3945         } else if (maximumSecondsReached()) {
    3946             handler_->message(CBC_MAXTIME, messages_) << CoinMessageEol ;
    3947             secondaryStatus_ = 4;
    39483954            status_ = 1 ;
    39493955        } else {
Note: See TracChangeset for help on using the changeset viewer.