Changeset 2439

Timestamp:

Mar 27, 2019 10:10:04 PM (2 years ago)

Author:

stefan

Message:

merge r2435,r2437,r2438 from stable/1.17 to trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• Clp (modified) (1 prop)
• Clp/src (modified) (1 prop)
• Clp/src/ClpEventHandler.cpp (modified) (1 diff)
• Clp/src/ClpSimplex.cpp (modified) (5 diffs)
• Clp/src/ClpSimplexNonlinear.cpp (modified) (1 diff)
• Clp/src/ClpSolve.cpp (modified) (1 diff)
• Clp/src/OsiClp (modified) (1 prop)
• Clp/src/OsiClp/OsiClpSolverInterface.cpp (modified) (1 diff)

trunk/Clp/src/ClpEventHandler.cpp

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

trunk/Clp/src/ClpSimplex.cpp

@@ -153 +153 @@
   primalColumnPivot_ = new ClpPrimalColumnSteepest();
   solveType_ = 1; // say simplex based life form
+  eventHandler_->setSimplex(this);
 }
 
@@ -266 +267 @@
   primalColumnPivot_ = new ClpPrimalColumnSteepest();
   solveType_ = 1; // say simplex based life form
+  eventHandler_->setSimplex(this);
   if (fixOthers) {
     int numberOtherColumns = rhs->numberColumns();
@@ -412 +414 @@
   }
   saveStatus_ = NULL;
+  eventHandler_->setSimplex(this);
   factorization_ = new ClpFactorization(*rhs->factorization_, -numberRows_);
   //factorization_ = new ClpFactorization(*rhs->factorization_,
@@ -6269 +6272 @@
   ClpInterior barrier;
   barrier.borrowModel(*model2);
+  barrier.eventHandler()->setSimplex(NULL);
   // See if quadratic objective
   ClpQuadraticObjective *quadraticObj = NULL;
@@ -7394 +7398 @@
       << CoinMessageEol;
     problemStatus_ = 1;
+    // but set secondary status to avoid errors
+    secondaryStatus_ = 6; // good enough
     return false;
   }

trunk/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) {

trunk/Clp/src/ClpSolve.cpp

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

trunk/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