minor changes for infeasible difficult problems

coin-or · Apr 30, 2016 · 1d65c46 · 1d65c46
1 parent e63f996
commit 1d65c46
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/Clp/src/ClpSimplexDual.cpp b/Clp/src/ClpSimplexDual.cpp
@@ -3213,7 +3213,8 @@ ClpSimplexDual::changeBounds(int initialize,
                     } else {
                          // set non basic free variables to fake bounds
                          // I don't think we should ever get here
-                         CoinAssert(!("should not be here"));
+ 		         // yes we can if basis goes singular twice in succession!
+                         //CoinAssert(!("should not be here"));
                          lower_[iSequence] = -0.5 * dualBound_;
                          upper_[iSequence] = 0.5 * dualBound_;
                          setFakeBound(iSequence, ClpSimplexDual::bothFake);
@@ -4551,7 +4552,8 @@ ClpSimplexDual::statusOfProblemInDual(int & lastCleaned, int type,
                          progress_.clearBadTimes();
 
                          // Go to safe
-                         factorization_->pivotTolerance(0.99);
+			 // not here - as can make more singular
+                         //factorization_->pivotTolerance(0.99);
                          forceFactorization_ = 1; // a bit drastic but ..
                          type = 2;
                          //assert (internalFactorize(1)==0);

diff --git a/Clp/src/ClpSolve.cpp b/Clp/src/ClpSolve.cpp
@@ -1761,6 +1761,10 @@ ClpSimplex::initialSolve(ClpSolve & options)
                     CoinMemcpyN(saveUpper + numberColumns_, numberRows_, model2->rowUpper());
                     delete [] saveUpper;
                     saveUpper = NULL;
+		    // return if wanted
+		    if (options.infeasibleReturn() || 
+			(moreSpecialOptions_ & 1) != 0) 
+		      return -1;
                }
           }
 #ifndef COIN_HAS_VOL