Changeset 1998


Ignore:
Timestamp:
Jun 7, 2012 8:02:54 AM (7 years ago)
Author:
stefan
Message:

better handling of user interrupt: tell Cbc that 'an event' had happened instead of faking a nodelimitreached

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Bonmin/src/CbcBonmin/BonCbc.cpp

    r1965 r1998  
    5151    }
    5252    if (currentBranchModel!=NULL)
    53       currentBranchModel->setMaximumNodes(0); // stop at next node
     53      currentBranchModel->sayEventHappened(); // stop at next node
    5454    if (OAModel!=NULL)
    55       OAModel->setMaximumNodes(0); // stop at next node
     55      OAModel->sayEventHappened(); // stop at next node
    5656    if (currentOA!=NULL)
    5757      currentOA->parameter().maxLocalSearchTime_ = 0.; // stop OA
     
    640640      }
    641641    }
    642     else if (model_.status() == 1) {
     642    else if (model_.status() == 1 || model_.status() == 5) {
    643643      status = TMINLP::LIMIT_EXCEEDED;
    644644      if (bestSolution_) {
Note: See TracChangeset for help on using the changeset viewer.