Changeset 1706

Timestamp:

Mar 16, 2011 10:29:23 AM (9 years ago)

Author:

forrest

Message:

fix for number iterations in ClpSolve? and check if gone feasible for extreme cases

Location:

trunk/Clp/src

Files:

• ClpSimplexDual.cpp (modified) (2 diffs)
• ClpSolve.cpp (modified) (1 diff)

trunk/Clp/src/ClpSimplexDual.cpp

@@ -4483 +4483 @@
         objectiveValue(),sumPrimalInfeasibilities_,
         sumDualInfeasibilities_);*/
+     // mark as having gone optimal if looks like it
+     if (!numberPrimalInfeasibilities_&&
+         !numberDualInfeasibilities_)
+       progressFlag_ |= 8;
      if (handler_->detail(CLP_SIMPLEX_STATUS, messages_) < 100) {
           handler_->message(CLP_SIMPLEX_STATUS, messages_)
@@ -5193 +5197 @@
      if (problemStatus_ > 2)
           objectiveValue_ = approximateObjective;
+     if (problemStatus_ == 1 && (progressFlag_&8) != 0 &&
+         fabs(objectiveValue_) > 1.0e10 )
+       problemStatus_ = 10; // infeasible - but has looked feasible
 }
 /* While updateDualsInDual sees what effect is of flip

trunk/Clp/src/ClpSolve.cpp

@@ -2479 +2479 @@
                setLogLevel(CoinMin(0, saveLevel));
           pinfo->postsolve(true);
+          numberIterations_ = 0;
           delete pinfo;
           pinfo = NULL;