Changeset 1610

Timestamp:

Sep 23, 2010 11:11:23 AM (11 years ago)

Author:

forrest

Message:

changes for more flexibility in ClpSolve?

Location:

trunk/Clp/src

Files:

• ClpEventHandler.hpp (modified) (2 diffs)
• ClpSolve.cpp (modified) (8 diffs)

trunk/Clp/src/ClpEventHandler.hpp

@@ -38 +38 @@
           solution, // for Cbc
           theta, // hit in parametrics
-          pivotRow // used to choose pivot row
+          pivotRow, // used to choose pivot row
+          presolveStart, // ClpSolve presolve start
+          presolveSize, // sees if ClpSolve presolve too big or too small
+          presolveInfeasible, // ClpSolve presolve infeasible
+          presolveBeforeSolve, // ClpSolve presolve before solve
+          presolveAfterFirstSolve, // ClpSolve presolve after solve
+          presolveAfterSolve, // ClpSolve presolve after solve
+          presolveEnd // ClpSolve presolve end
      };
-     /**@name Virtual method that the derived classe should provide.
+     /**@name Virtual method that the derived classes should provide.
       The base class instance does nothing and as event() is only useful method
       it would not be very useful NOT providing one!
@@ -47 +54 @@
      /** This can do whatever it likes.  If return code -1 then carries on
          if 0 sets ClpModel::status() to 5 (stopped by event) and will return to user.
-         At present if <-1 carries on and if >0 acts as if 0 - this may change
+         At present if <-1 carries on and if >0 acts as if 0 - this may change.
+         For ClpSolve 2 -> too big return status of -2 and -> too small 3
      */
      virtual int event(Event whichEvent);

trunk/Clp/src/ClpSolve.cpp

@@ -25 +25 @@
 #include "ClpNetworkMatrix.hpp"
 #endif
+#include "ClpEventHandler.hpp"
 #include "ClpLinearObjective.hpp"
 #include "ClpSolve.hpp"
@@ -435 +436 @@
      double timeIdiot = 0.0;
      double timeCore = 0.0;
+     eventHandler()->event(ClpEventHandler::presolveStart);
      int savePerturbation = perturbation_;
      int saveScaling = scalingFlag_;
@@ -489 +491 @@
                          << CoinMessageEol;
                model2 = this;
+               eventHandler()->event(ClpEventHandler::presolveStart);
                problemStatus_ = 1; // may be unbounded but who cares
                if (options.infeasibleReturn() || (moreSpecialOptions_ & 1) != 0) {
@@ -494 +497 @@
                }
                presolve = ClpSolve::presolveOff;
-          }
+          } else {
+              model2->eventHandler()->setSimplex(model2);
+              int rcode=model2->eventHandler()->event(ClpEventHandler::presolveSize);
+              // see if too big or small
+              if (rcode==2) {
+                  delete model2;
+                  return -2;
+              } else if (rcode==3) {
+                  delete model2;
+                  return -3;
+              }
+          }
+          model2->eventHandler()->setSimplex(model2);
           // We may be better off using original (but if dual leave because of bounds)
           if (presolve != ClpSolve::presolveOff &&
@@ -516 +531 @@
      int doSlp = 0;
      int primalStartup = 1;
+     model2->eventHandler()->event(ClpEventHandler::presolveBeforeSolve);
      bool tryItSave = false;
      // switch to primal from automatic if just one cost entry
@@ -2467 +2483 @@
           // checkSolution(); already done by postSolve
           setLogLevel(saveLevel);
-          if (finalStatus != 3 && (finalStatus || status() == -1)) {
+          setProblemStatus(finalStatus);
+          setSecondaryStatus(finalSecondaryStatus);
+          int rcode=eventHandler()->event(ClpEventHandler::presolveAfterFirstSolve);
+          if (finalStatus != 3 && rcode < 0 && (finalStatus || status() == -1)) {
                int savePerturbation = perturbation();
                if (!finalStatus || (moreSpecialOptions_ & 2) == 0) {
@@ -2496 +2515 @@
                          << CoinMessageEol;
                timeX = time2;
-          } else {
+          } else if (rcode >= 0) {
+              primal(1);
+          } else {
                secondaryStatus_ = finalSecondaryStatus;
           }
@@ -2554 +2575 @@
           finalStatus = status();
      }
+     eventHandler()->event(ClpEventHandler::presolveEnd);
      return finalStatus;
 }