Changeset 2004


Ignore:
Timestamp:
Jun 8, 2012 6:52:57 AM (7 years ago)
Author:
stefan
Message:

merge r2002 from trunk: fixes segfault in ecp with nondefault settings

Location:
stable/1.6
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable/1.6

    • Property svn:mergeinfo changed
      /trunkmerged: 2002
  • stable/1.6/Bonmin

  • stable/1.6/Bonmin/src

  • stable/1.6/Bonmin/src/Interfaces/BonOsiTMINLPInterface.cpp

    r1988 r2004  
    20162016      violation = std::max(violation, rhs - ub[cutIdx]);
    20172017      violation = std::max(violation, lb[cutIdx] - rhs);
    2018       if(violation < theta && oaHandler_) {
     2018      if(violation < theta && oaHandler_->logLevel() > 0) {
    20192019          oaHandler_->message(CUT_NOT_VIOLATED_ENOUGH, oaMessages_)<<cut2rowIdx[cutIdx]<<violation<<CoinMessageEol;
    20202020        continue;}
    2021       if(oaHandler_)
     2021      if(oaHandler_->logLevel() > 0)
    20222022          oaHandler_->message(VIOLATED_OA_CUT_GENERATED, oaMessages_)<<cut2rowIdx[cutIdx]<<violation<<CoinMessageEol;
    20232023    }
Note: See TracChangeset for help on using the changeset viewer.