Changeset 1494 for trunk/Clp

Timestamp:

Jan 27, 2010 12:49:41 PM (11 years ago)

Author:

forrest

Message:

fix for extremely badly scaled fathom

File:

• trunk/Clp/src/ClpSimplex.cpp (modified) (2 diffs)

trunk/Clp/src/ClpSimplex.cpp

@@ -10073 +10073 @@
         static_cast<ClpSimplexOther *> (this)->afterCrunch(*small,
                                                 whichRow,whichColumn,nBound);
+        bool badSolution=false;
         for (int i=0;i<numberColumns_;i++) {
           if (integerType_[i]) { 
             double value = columnActivity_[i];
             double value2 = floor(value+0.5);
-            assert (fabs(value-value2)<1.0e-4);
+            if (fabs(value-value2)>=1.0e-4) {
+              // Very odd - can't use
+              badSolution=true;
+            }
             columnActivity_[i]=value2;
             if (fixBounds) {
@@ -10084 +10088 @@
             }
           }
+        }
+        if (badSolution) {
+          info->nNodes_=-1;
+          returnCode=0;
         }
         //setLogLevel(63);