Changeset 2047 for stable


Ignore:
Timestamp:
Aug 20, 2014 3:06:32 AM (5 years ago)
Author:
forrest
Message:

changes for semi-strong branching

Location:
stable/1.15/Clp/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/1.15/Clp/src/ClpModel.hpp

    r2045 r2047  
    421421         8 - failed due to bad element check
    422422         9 - status was 3 and stopped on time
     423         10 - status was 3 and can't use objective as lb
    423424         100 up - translation of enum from ClpEventHandler
    424425     */
  • stable/1.15/Clp/src/OsiClp/OsiClpSolverInterface.cpp

    r2045 r2047  
    16231623  const int status = modelPtr_->status();
    16241624  const int secondaryStatus = modelPtr_->secondaryStatus();
    1625   return (status == 3 && secondaryStatus == 0);
     1625  return (status == 3 && (secondaryStatus == 0 ||secondaryStatus == 10));
    16261626}
    16271627
     
    67156715    small->dual(0,7);
    67166716#endif
     6717    modelPtr_->secondaryStatus_=0;
    67176718    totalIterations += small->numberIterations();
    67186719    int problemStatus = small->problemStatus();
     
    68016802    } else {
    68026803      if (problemStatus==3) {
     6804        if (!inCbcOrOther) {
     6805          // Calling code not Cbc - may want information from larger model
     6806          static_cast<ClpSimplexOther *> (modelPtr_)->afterCrunch(*small,whichRow,whichColumn,nBound);
     6807          // but may not be able to trust objective as lower bound
     6808          if (small->algorithm_==1/*||small->sumDualInfeasibilities_>1.0e-5*/)
     6809            modelPtr_->secondaryStatus_=10;
     6810        }
    68036811        // may be problems
    68046812        if (inCbcOrOther&&disasterHandler_->inTrouble()) {
Note: See TracChangeset for help on using the changeset viewer.