Ignore:
Timestamp:
Sep 10, 2009 12:21:53 PM (10 years ago)
Author:
forrest
Message:

fixes etc

File:
1 edited

Legend:

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

    r1427 r1429  
    593593  if (!returnCode)
    594594    gutsOfDual(ifValuesPass,saveDuals,initialStatus,data);
     595  if (!problemStatus_) {
     596    // see if cutoff reached
     597    double limit = 0.0;
     598    getDblParam(ClpDualObjectiveLimit, limit);
     599    if(fabs(limit)<1.0e30&&objectiveValue()*optimizationDirection_>
     600       limit+1.0e-7+1.0e-8*fabs(limit)) {
     601      // actually infeasible on objective
     602      problemStatus_=1;
     603      secondaryStatus_=1;
     604    }
     605  }
    595606  if (problemStatus_==10)
    596607    startFinishOptions |= 1;
     
    61796190  // Stop can skip some things in transposeTimes
    61806191  specialOptions_ &= ~131072;
     6192  if (!problemStatus_) {
     6193    // see if cutoff reached
     6194    double limit = 0.0;
     6195    getDblParam(ClpDualObjectiveLimit, limit);
     6196    if(fabs(limit)<1.0e30&&objectiveValue()*optimizationDirection_>
     6197       limit+1.0e-7+1.0e-8*fabs(limit)) {
     6198      // actually infeasible on objective
     6199      problemStatus_=1;
     6200      secondaryStatus_=1;
     6201    }
     6202  }
    61816203  if (problemStatus_==3)
    61826204    objectiveValue_ = CoinMax(bestObjectiveValue_,objectiveValue_-bestPossibleImprovement_);
Note: See TracChangeset for help on using the changeset viewer.