Changeset 1435 for stable/1.10

Timestamp:

Sep 25, 2009 11:22:06 AM (10 years ago)

Author:

forrest

Message:

don't allow zero pivot in dualColumn

File:

• stable/1.10/Clp/src/ClpSimplexDual.cpp (modified) (2 diffs)

stable/1.10/Clp/src/ClpSimplexDual.cpp

@@ -3655 +3655 @@
   }
 
-  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_];
@@ -3733 +3729 @@
       lowerIn_=valueIn_;
     }
+  } else {
+    // no pivot
+    bestPossible=0.0;
+    alpha_=0.0;
   }
   //if (thisIncrease)