Changeset 1499

Timestamp:

Jan 29, 2010 5:03:06 AM (12 years ago)

Author:

forrest

Message:

try and fix accuracy problems

Location:

trunk/Clp/src

Files:

• ClpSimplex.cpp (modified) (2 diffs)
• ClpSimplexPrimal.cpp (modified) (1 diff)

trunk/Clp/src/ClpSimplex.cpp

@@ -11235 +11235 @@
   }
   if (problemStatus_==10) {
+    // Say second call
+    moreSpecialOptions_ |= 256;
     //printf("Cleaning up with primal\n");
     //lastAlgorithm=1;
@@ -11299 +11301 @@
 #endif
     }
+    // Say not second call
+    moreSpecialOptions_ &= ~256;
     intParam_[ClpMaxNumIteration] = saveMax;
     

trunk/Clp/src/ClpSimplexPrimal.cpp

@@ -1452 +1452 @@
   if (numberIterations_>lastBadIteration_+100)
     moreSpecialOptions_ &= ~16; // clear check accuracy flag
-  if (goToDual) 
+  if (goToDual||numberIterations_>1000&&largestPrimalError_>1.0e6
+      &&largestDualError_>1.0e6) {
     problemStatus_=10; // try dual
-  // If bad go to dual
-  if (numberIterations_>1000&&largestPrimalError_>1.0e6
-      &&largestDualError_>1.0e6) 
-    problemStatus_=10; // try dual
+    // See if second call
+    if ((moreSpecialOptions_&256)!=0) {
+      numberPrimalInfeasibilities_ = nonLinearCost_->numberInfeasibilities();
+      sumPrimalInfeasibilities_ = nonLinearCost_->sumInfeasibilities();
+      // say infeasible
+      if (numberPrimalInfeasibilities_)
+        problemStatus_=1;
+    }
+  }
   // make sure first free monotonic
   if (firstFree_>=0&&saveFirstFree>=0) {