Changeset 2438 for stable/1.17

Timestamp:

Mar 26, 2019 8:39:54 AM (2 years ago)

Author:

forrest

Message:

try and fix event handler

Location:

stable/1.17/Clp/src

Files:

• ClpEventHandler.cpp (modified) (1 diff)
• ClpSimplexNonlinear.cpp (modified) (1 diff)
• ClpSolve.cpp (modified) (1 diff)
• OsiClp/OsiClpSolverInterface.cpp (modified) (1 diff)

stable/1.17/Clp/src/ClpEventHandler.cpp

@@ -56 +56 @@
 int ClpEventHandler::event(Event whichEvent)
 {
+
+  assert (!model_||model_->eventHandler()==this);
   if (whichEvent != theta)
     return -1; // do nothing

stable/1.17/Clp/src/ClpSimplexNonlinear.cpp

@@ -2099 +2099 @@
       //objTheta=-1.0; // so we fall through
     }
-    assert(theta_ < 1.0e30); // for now
+    if (theta_ >= 1.0e30) // odd
+      ordinaryDj=true;
     // See if we need to pivot
     if (theta_ == basicTheta || ordinaryDj) {

stable/1.17/Clp/src/ClpSolve.cpp

@@ -3117 +3117 @@
     ClpInterior barrier(*model2);
 #endif
+    barrier.eventHandler()->setSimplex(NULL);
     if (interrupt)
       currentModel2 = &barrier;

stable/1.17/Clp/src/OsiClp/OsiClpSolverInterface.cpp

@@ -117 +117 @@
     deleteSolver = true;
     solver->borrowModel(*modelPtr_);
+    solver->eventHandler()->setSimplex(solver);
     // See if user set factorization frequency
     // borrowModel does not move