Changeset 1394 for trunk

Timestamp:

Jul 9, 2009 10:05:23 AM (12 years ago)

Author:

forrest

Message:

allow infeasibilityray more and prepare

Location:

trunk/Clp/src

Files:

• ClpFactorization.hpp (modified) (1 diff)
• ClpModel.cpp (modified) (1 diff)
• ClpPredictorCorrector.cpp (modified) (1 diff)
• ClpSimplexDual.cpp (modified) (2 diffs)
• ClpSimplexPrimal.cpp (modified) (2 diffs)

trunk/Clp/src/ClpFactorization.hpp

@@ -14 +14 @@
 class CoinOtherFactorization;
 #ifndef CLP_MULTIPLE_FACTORIZATIONS 
-#ifdef CLP_OSL 
 #define CLP_MULTIPLE_FACTORIZATIONS 4
-#else
-#define CLP_MULTIPLE_FACTORIZATIONS 3
-#endif
 #endif    
 #ifdef CLP_MULTIPLE_FACTORIZATIONS 

trunk/Clp/src/ClpModel.cpp

@@ -2585 +2585 @@
 {
   double * array = NULL;
-  if (problemStatus_==1&&!secondaryStatus_) {
+  if (problemStatus_==1) {
     array = ClpCopyOfArray(ray_,numberRows_);
-    //#define SWAP_SIGN
-#ifdef SWAP_SIGN
+#ifndef CLP_NO_SWAP_SIGN
     // swap signs to be consistent with norm
     for (int i=0;i<numberRows_;i++)

trunk/Clp/src/ClpPredictorCorrector.cpp

@@ -3138 +3138 @@
 #define KILL_ITERATION 50
 #else
+#if CLP_CAUTION < 1
+#define KILL_ITERATION 50
+#else
 #define KILL_ITERATION 100
+#endif
 #endif
   if (!quadraticObj||1) {

trunk/Clp/src/ClpSimplexDual.cpp

@@ -4440 +4440 @@
          sumDualInfeasibilities_,numberDualInfeasibilities_);
 #endif   
+  double approximateObjective=objectiveValue_;
 #ifdef CLP_REPORT_PROGRESS
     if (ixxxxxx>=ixxyyyy-4&&ixxxxxx<=ixxyyyy) {
@@ -5120 +5121 @@
   if (alphaAccuracy_>0.0)
       alphaAccuracy_=1.0;
+  // If we are stopping - use plausible objective
+  // Maybe only in fast dual
+  if (problemStatus_>2)
+    objectiveValue_ = approximateObjective;
 }
 /* While updateDualsInDual sees what effect is of flip

trunk/Clp/src/ClpSimplexPrimal.cpp

@@ -821 +821 @@
     dummy=4;
     matrix_->generalExpanded(this,9,dummy);
-#ifdef CLP_CAUTION
+#ifndef CLP_CAUTION
+#define CLP_CAUTION 1
+#endif
+#if CLP_CAUTION
     double lastAverageInfeasibility=sumDualInfeasibilities_/
       static_cast<double>(numberDualInfeasibilities_+10);
@@ -828 +831 @@
     double sumInfeasibility =  nonLinearCost_->sumInfeasibilities();
     int reason2=0;
-#ifdef CLP_CAUTION
+#if CLP_CAUTION
 #if CLP_CAUTION==2
     double test2=1.0e5;