Changeset 2297 for trunk


Ignore:
Timestamp:
Jan 6, 2018 4:57:42 AM (22 months ago)
Author:
forrest
Message:

allow easier stopping postsolve cleanup

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/src/ClpSolve.cpp

    r2290 r2297  
    37943794          setProblemStatus(finalStatus);
    37953795          setSecondaryStatus(finalSecondaryStatus);
     3796          /* Code modified so rcode -1 as normal, >0 clean up, 0 say optimal */
    37963797          int rcode=eventHandler()->event(ClpEventHandler::presolveAfterFirstSolve);
     3798          //#define TREAT_AS_OPTIMAL_TOLERANCE 1.0e-4
     3799#ifdef TREAT_AS_OPTIMAL_TOLERANCE
     3800          if (rcode == -1 && sumPrimalInfeasibilities_ < TREAT_AS_OPTIMAL_TOLERANCE &&
     3801              sumDualInfeasibilities_ < TREAT_AS_OPTIMAL_TOLERANCE)
     3802            rcode=0;
     3803#endif
    37973804          if (finalStatus != 3 && rcode < 0 && (finalStatus || oldStatus == -1)) {
    37983805               double sumPrimal=sumPrimalInfeasibilities_;
     
    38583865                         << CoinMessageEol;
    38593866               timeX = time2;
    3860           } else if (rcode >= 0) {
     3867          } else if (rcode > 0) { // was >= 0
    38613868#ifdef ABC_INHERIT
    38623869            dealWithAbc(1,2,true);
Note: See TracChangeset for help on using the changeset viewer.