Changeset 1428 for trunk

Timestamp:

Sep 7, 2009 8:38:58 AM (12 years ago)

Author:

forrest

Message:

fix for Marc

Location:

trunk/Clp/src

Files:

• ClpSimplex.cpp (modified) (5 diffs)
• ClpSimplex.hpp (modified) (2 diffs)
• ClpSimplexPrimal.cpp (modified) (2 diffs)

trunk/Clp/src/ClpSimplex.cpp

@@ -1531 +1531 @@
           }
         }
+#if 0
         if (numberBasic<numberRows_) {
           // add some slacks in case odd warmstart
@@ -1549 +1550 @@
           }
         }
+#endif
       } else {
         // all slack basis
@@ -5149 +5151 @@
       startFinishOptions |= 2;
     baseIteration_=numberIterations_;
+    // Say second call
+    moreSpecialOptions_ |= 256;
     if ((matrix_->generalExpanded(this,4,dummy)&1)!=0)
       returnCode = static_cast<ClpSimplexPrimal *> (this)->primal(1,startFinishOptions);
     else
       returnCode = static_cast<ClpSimplexDual *> (this)->dual(0,startFinishOptions);
+    // Say not second call
+    moreSpecialOptions_ &= ~256;
     baseIteration_=0;
     if (saveObjective != objective_) {
@@ -5471 +5477 @@
     int dummy;
     baseIteration_=numberIterations_;
+    // Say second call
+    moreSpecialOptions_ |= 256;
     if ((matrix_->generalExpanded(this,4,dummy)&2)!=0&&(specialOptions_&8192)==0) {
       double saveBound = dualBound_;
@@ -5480 +5488 @@
       returnCode = static_cast<ClpSimplexPrimal *> (this)->primal(0,startFinishOptions);
     }
+    // Say not second call
+    moreSpecialOptions_ &= ~256;
     baseIteration_=0;
     setInitialDenseFactorization(denseFactorization);

trunk/Clp/src/ClpSimplex.hpp

@@ -952 +952 @@
       64 bit - give up easily in dual (and say infeasible)
       128 bit - no objective, 0-1 and in B&B
+      256 bit - in primal from dual or vice versa
   */
   inline int moreSpecialOptions() const
@@ -964 +965 @@
       64 bit - give up easily in dual (and say infeasible)
       128 bit - no objective, 0-1 and in B&B
+      256 bit - in primal from dual or vice versa
   */
   inline void setMoreSpecialOptions(int value)

trunk/Clp/src/ClpSimplexPrimal.cpp

@@ -1214 +1214 @@
           numberDualInfeasibilities_=1; // carry on
           problemStatus_=-1;
-        } else if (numberDualInfeasibilities_==0&&largestDualError_>1.0e-2) {
+        } else if (numberDualInfeasibilities_==0&&largestDualError_>1.0e-2&&
+                   (moreSpecialOptions_&256)==0) {
           goToDual=true;
           factorization_->pivotTolerance(CoinMax(0.9,factorization_->pivotTolerance()));
@@ -1262 +1263 @@
         goToDual=unPerturb(); // stop any further perturbation
         if (numberRows_>20000&&!numberTimesOptimal_)
-          goToDual=0; // Better to carry on a bit longer
+          goToDual=false; // Better to carry on a bit longer
         lastCleaned=-1; // carry on
       }