Changeset 1699 for trunk

Timestamp:

Mar 8, 2011 5:49:01 AM (9 years ago)

Author:

forrest

Message:

allow to distinguish between infeasible and unbounded in presolve

Location:

trunk/Clp/src

Files:

• ClpPresolve.cpp (modified) (2 diffs)
• ClpPresolve.hpp (modified) (1 diff)
• ClpSolve.cpp (modified) (1 diff)

trunk/Clp/src/ClpPresolve.cpp

@@ -147 +147 @@
 {
      return originalModel_;
+}
+// Return presolve status (0,1,2)
+int 
+ClpPresolve::presolveStatus() const
+{
+  if (nelems_>=0) {
+    // feasible (or not done yet)
+    return 0;
+  } else {
+    int presolveStatus = - nelems_;
+    // If both infeasible and unbounded - say infeasible
+    if (presolveStatus>2)
+      presolveStatus = 1;
+    return presolveStatus;
+  }
 }
 void
@@ -1854 +1869 @@
                // infeasible or unbounded
                result = 1;
+               // Put status in nelems_!
+               nelems_ = - prob.status_;
                originalModel->setProblemStatus(prob.status_);
           } else {

trunk/Clp/src/ClpPresolve.hpp

@@ -181 +181 @@
           presolveActions_ |= 0x80000000;
      }
+     /// Return presolve status (0,1,2)
+     int presolveStatus() const;
 
      /**@name postsolve - postsolve the problem.  If the problem

trunk/Clp/src/ClpSolve.cpp

@@ -494 +494 @@
                model2 = this;
                eventHandler()->event(ClpEventHandler::presolveInfeasible);
-               problemStatus_ = 1; // may be unbounded but who cares
+               problemStatus_ = pinfo->presolveStatus(); 
                if (options.infeasibleReturn() || (moreSpecialOptions_ & 1) != 0) {
                  delete pinfo;