Changeset 851 for trunk/Clp/src/ClpSimplexDual.cpp

Timestamp:

Aug 24, 2006 6:16:59 AM (13 years ago)

Author:

forrest

Message:

fixes

File:

• trunk/Clp/src/ClpSimplexDual.cpp (modified) (6 diffs)

trunk/Clp/src/ClpSimplexDual.cpp

@@ -2399 +2399 @@
                            CoinIndexedVector * spareArray,
                            double acceptablePivot,
-                           double & upperReturn, double &bestReturn)
+                           double & upperReturn, double &bestReturn,double & badFree)
 {
   // do first pass to get possibles 
@@ -2415 +2415 @@
   int numberRemaining=0;
   int i;
+  badFree=0.0;
   for (int iSection=0;iSection<2;iSection++) {
 
@@ -2450 +2451 @@
         bestPossible = CoinMax(bestPossible,fabs(alpha));
         oldValue = reducedCost[iSequence];
-        // If freehas to be very large - should come in via dualRow
-        if (getStatus(iSequence+addSequence)==isFree&&fabs(alpha)<1.0e-3)
-          break;
+        // If free has to be very large - should come in via dualRow
+        //if (getStatus(iSequence+addSequence)==isFree&&fabs(alpha)<1.0e-3)
+        //break;
         if (oldValue>dualTolerance_) {
           keep = true;
@@ -2458 +2459 @@
           keep = true;
         } else {
-          if (fabs(alpha)>CoinMax(10.0*acceptablePivot,1.0e-5)) 
+          if (fabs(alpha)>CoinMax(10.0*acceptablePivot,1.0e-5)) {
             keep = true;
-          else
+          } else {
             keep=false;
+            badFree=CoinMax(badFree,fabs(alpha));
+          }
         }
         if (keep) {
@@ -2596 +2599 @@
   upperTheta = 1.0e31;
   double bestPossible=0.0;
+  double badFree=0.0;
   if (spareIntArray_[0]!=-1) {
     numberRemaining = dualColumn0(rowArray,columnArray,spareArray,
-                                  acceptablePivot,upperTheta,bestPossible);
+                                  acceptablePivot,upperTheta,bestPossible,badFree);
   } else {
     // already done
@@ -3107 +3111 @@
       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;
     }