Changeset 1442 for trunk

Timestamp:

Oct 2, 2009 10:37:11 AM (10 years ago)

Author:

forrest

Message:

fix bad write and optional parentheses

Location:

trunk/Clp/src

Files:

• ClpSimplex.cpp (modified) (2 diffs)
• ClpSimplexDual.cpp (modified) (2 diffs)

trunk/Clp/src/ClpSimplex.cpp

@@ -3276 +3276 @@
     if (newArrays&&(specialOptions_&65536)==0) {
       delete [] cost_;
-      cost_ = new double[numberTotal];
+      cost_ = new double[2*numberTotal];
       delete [] lower_;
       delete [] upper_;
@@ -10244 +10244 @@
       }
 #endif
-      if (numberIterations*(numberRows_+numberColumns_)>5.0e8) {
+      if (numberIterations*(numberRows_+numberColumns_)>5.0e8||
+          numberNodes>1.0e6) {
         // give up
         info->nNodes_ =-1;

trunk/Clp/src/ClpSimplexDual.cpp

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