Changeset 1717

Timestamp:

Mar 30, 2011 4:48:54 AM (9 years ago)

Author:

forrest

Message:

changes to try and make more stable

Location:

trunk/Clp/src

Files:

• ClpFactorization.cpp (modified) (1 diff)
• ClpSimplexDual.cpp (modified) (3 diffs)
• ClpSimplexPrimal.cpp (modified) (1 diff)

trunk/Clp/src/ClpFactorization.cpp

@@ -2820 +2820 @@
                                      double pivotValue)
 {
+     double newValue;
      // better to have small tolerance even if slower
+     if (zeroValue > 0.0)
+          newValue = zeroValue;
+     else
+          newValue = -zeroTolerance() * zeroValue;
      zeroTolerance(CoinMin(zeroTolerance(), zeroValue));
      // better to have large tolerance even if slower
-     double newValue;
      if (pivotValue > 0.0)
           newValue = pivotValue;

trunk/Clp/src/ClpSimplexDual.cpp

@@ -535 +535 @@
           // Do iterations
           int returnCode = whileIterating(saveDuals, ifValuesPass);
+          if (problemStatus_ == 1 && (progressFlag_&8) != 0 &&
+              fabs(objectiveValue_) > 1.0e10 )
+            problemStatus_ = 10; // infeasible - but has looked feasible
 #ifdef CLP_INVESTIGATE_SERIAL
           nPivots = factorization_->pivots();
@@ -1366 +1369 @@
                                    printf("flag a %g %g\n", btranAlpha, alpha_);
 #endif
-                                   //#define FEB_TRY
-#ifdef FEB_TRY
+                                   //#define FEB_TRY
+#if 1 //def FEB_TRY
                                    // Make safer?
-                                   factorization_->saferTolerances (1.0e-15, -1.03);
+                                   factorization_->saferTolerances (-0.99, -1.03);
 #endif
                                    setFlagged(sequenceOut_);
@@ -4976 +4979 @@
                       CoinMemcpyN(savedSolution_ ,
                                   numberColumns_, columnActivityWork_);
-                      //numberDualInfeasibilities_=1;
                       problemStatus_ = 10;
                       situationChanged = 0;
-                      //numberPrimalInfeasibilities_=1;
                     }
                     //assert(numberDualInfeasibilitiesWithoutFree_==0);
                     if (numberDualInfeasibilities_) {
-                         if (numberPrimalInfeasibilities_ || numberPivots) {
+                        if ((numberPrimalInfeasibilities_ || numberPivots)
+                            && problemStatus_!=10) {
                               problemStatus_ = -1; // carry on as normal
                          } else {

trunk/Clp/src/ClpSimplexPrimal.cpp

@@ -2892 +2892 @@
                                         << CoinMessageEol;
                               setFlagged(sequenceIn_);
-#ifdef FEB_TRY
+#if 1 //def FEB_TRY
                               // Make safer?
-                              factorization_->saferTolerances (1.0e-15, -1.03);
+                              factorization_->saferTolerances (-0.99, -1.03);
 #endif
                               progress_.clearBadTimes();