Changeset 1436 for trunk

Timestamp:

Sep 25, 2009 11:26:48 AM (12 years ago)

Author:

forrest

Message:

fix divide by zero

Location:

trunk/Clp/src

Files:

• ClpDualRowSteepest.cpp (modified) (1 diff)
• ClpModel.hpp (modified) (1 diff)
• ClpSimplexDual.cpp (modified) (2 diffs)

trunk/Clp/src/ClpDualRowSteepest.cpp

@@ -537 +537 @@
     // could re-initialize here (could be expensive)
     norm /= model_->alpha() * model_->alpha();
-    
+    assert(model_->alpha());
     assert(norm);
     // pivot element

trunk/Clp/src/ClpModel.hpp

@@ -18 +18 @@
 #include "CoinMessageHandler.hpp"
 #include "CoinHelperFunctions.hpp"
+#include "CoinFinite.hpp"
 #include "ClpParameters.hpp"
 #include "ClpObjective.hpp"
 class ClpEventHandler;
-
-// Plus infinity
-#ifndef COIN_DBL_MAX
-#define COIN_DBL_MAX DBL_MAX
-#endif
-
 /** This is the base class for Linear and quadratic Models
     This knows nothing about the algorithm, but it seems to

trunk/Clp/src/ClpSimplexDual.cpp

@@ -3818 +3818 @@
   }
 
-  if (sequenceIn_>=0) {
 #ifdef MORE_CAREFUL
     // If we have done pivots and things look bad set alpha_ 0.0 to force factorization
-    if (badSumPivots) {
+    if (badSumPivots||
+        fabs(theta_*badFree)>10.0*dualTolerance_&&factorization_->pivots()) {
       if (handler_->logLevel()>1)
         printf("forcing re-factorization\n");
-      alpha_=0.0;
-    }
-    if (fabs(theta_*badFree)>10.0*dualTolerance_&&factorization_->pivots()) {
-      if (handler_->logLevel()>1)
-        printf("forcing re-factorizationon free\n");
-      alpha_=0.0;
-    }
-#endif
+      sequenceIn_=-1;
+    }
+#endif
+  if (sequenceIn_>=0) {
     lowerIn_ = lower_[sequenceIn_];
     upperIn_ = upper_[sequenceIn_];
@@ -3896 +3892 @@
       lowerIn_=valueIn_;
     }
+  } else {
+    // no pivot
+    bestPossible=0.0;
+    alpha_=0.0;
   }
   //if (thisIncrease)