Changeset 862 for stable/0.4


Ignore:
Timestamp:
Jun 13, 2012 3:00:16 PM (8 years ago)
Author:
stefan
Message:

fix r861: currentOA and OAModel are global variables in Bonmin, thus extern should be used (as in trunk)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/0.4/Couenne/src/main/CouenneBab.cpp

    r861 r862  
    3838// Code to enable user interruption
    3939static CbcModel * currentBranchModel = NULL; //pointer to the main b&b
     40extern Bonmin::OACutGenerator2 * currentOA = NULL; //pointer to the OA generator
     41extern CbcModel * OAModel; // pointer to the submip if using Cbc
    4042
    4143#define SIGNAL
     
    5456    }
    5557    if (currentBranchModel)       currentBranchModel->sayEventHappened(); // stop at next node
     58    if (OAModel)                  OAModel->sayEventHappened(); // stop at next node
     59    if (currentOA)                currentOA->parameter().maxLocalSearchTime_ = 0.; // stop OA
    5660
    5761    BonminInterruptedOnce = true;
Note: See TracChangeset for help on using the changeset viewer.