Changeset 2000


Ignore:
Timestamp:
Jun 7, 2012 9:30:47 AM (7 years ago)
Author:
stefan
Message:

merge r1998 from trunk; update externals to latest releases

Location:
stable/1.6
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • stable/1.6

    • Property svn:externals
      •  

        old new  
        1 BuildTools  https://projects.coin-or.org/svn/BuildTools/releases/0.7.1/
        2 ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/releases/1.2.0/
        3 ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/releases/1.3.1/
        4 ThirdParty/HSL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/HSL/releases/1.3.1/
        5 ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/releases/1.2.1/
        6 ThirdParty/FilterSQP  https://projects.coin-or.org/svn/BuildTools/ThirdParty/FilterSQP/releases/1.2.0/
        7 ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/releases/1.4.1/
        8 ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/releases/1.2.1/
        9 Data/Sample  https://projects.coin-or.org/svn/Data/Sample/releases/1.2.0/
        10 CoinUtils  https://projects.coin-or.org/svn/CoinUtils/releases/2.8.5/CoinUtils
        11 Cbc  https://projects.coin-or.org/svn/Cbc/releases/2.7.5/Cbc
        12 Cgl  https://projects.coin-or.org/svn/Cgl/releases/0.57.2/Cgl
        13 Clp  https://projects.coin-or.org/svn/Clp/releases/1.14.5/Clp
        14 Ipopt  https://projects.coin-or.org/svn/Ipopt/releases/3.10.1/Ipopt
        15 Osi  https://projects.coin-or.org/svn/Osi/releases/0.105.2/Osi
        16 
         1BuildTools  https://projects.coin-or.org/svn/BuildTools/releases/0.7.2/
         2ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/releases/1.2.1/
         3ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/releases/1.3.2/
         4ThirdParty/HSL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/HSL/releases/1.3.2/
         5ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/releases/1.2.2/
         6ThirdParty/FilterSQP  https://projects.coin-or.org/svn/BuildTools/ThirdParty/FilterSQP/releases/1.2.1/
         7ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/releases/1.4.2/
         8ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/releases/1.2.2/
         9Data/Sample  https://projects.coin-or.org/svn/Data/Sample/releases/1.2.1/
         10CoinUtils  https://projects.coin-or.org/svn/CoinUtils/releases/2.8.6/CoinUtils
         11Cbc  https://projects.coin-or.org/svn/Cbc/releases/2.7.7/Cbc
         12Cgl  https://projects.coin-or.org/svn/Cgl/releases/0.57.3/Cgl
         13Clp  https://projects.coin-or.org/svn/Clp/releases/1.14.6/Clp
         14Ipopt  https://projects.coin-or.org/svn/Ipopt/releases/3.10.2/Ipopt
         15Osi  https://projects.coin-or.org/svn/Osi/releases/0.105.3/Osi
    • Property svn:mergeinfo changed
      /trunk (added)merged: 1998
  • stable/1.6/Bonmin

  • stable/1.6/Bonmin/src

  • stable/1.6/Bonmin/src/CbcBonmin/BonCbc.cpp

    r1967 r2000  
    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_) {
  • stable/1.6/Bonmin/test

    • Property svn:mergeinfo deleted
Note: See TracChangeset for help on using the changeset viewer.