Changeset 2218 for trunk


Ignore:
Timestamp:
Apr 30, 2016 12:01:29 PM (4 years ago)
Author:
forrest
Message:

minor changes for infeasible difficult problems

Location:
trunk/Clp/src
Files:
2 edited

Legend:

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

    r2206 r2218  
    32143214                         // set non basic free variables to fake bounds
    32153215                         // I don't think we should ever get here
    3216                          CoinAssert(!("should not be here"));
     3216                         // yes we can if basis goes singular twice in succession!
     3217                         //CoinAssert(!("should not be here"));
    32173218                         lower_[iSequence] = -0.5 * dualBound_;
    32183219                         upper_[iSequence] = 0.5 * dualBound_;
     
    45524553
    45534554                         // Go to safe
    4554                          factorization_->pivotTolerance(0.99);
     4555                         // not here - as can make more singular
     4556                         //factorization_->pivotTolerance(0.99);
    45554557                         forceFactorization_ = 1; // a bit drastic but ..
    45564558                         type = 2;
  • trunk/Clp/src/ClpSolve.cpp

    r2189 r2218  
    17621762                    delete [] saveUpper;
    17631763                    saveUpper = NULL;
     1764                    // return if wanted
     1765                    if (options.infeasibleReturn() ||
     1766                        (moreSpecialOptions_ & 1) != 0)
     1767                      return -1;
    17641768               }
    17651769          }
Note: See TracChangeset for help on using the changeset viewer.