Changeset 2439 for trunk/Clp/src/ClpSimplexNonlinear.cpp

Timestamp:

Mar 27, 2019 10:10:04 PM (22 months 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/ClpSimplexNonlinear.cpp (modified) (1 diff)

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