Changeset 1585 for trunk

Timestamp:

Aug 11, 2010 8:28:46 AM (9 years ago)

Author:

forrest

Message:

changes to help SCIP

Location:

trunk/Clp/src

Files:

• ClpSimplex.cpp (modified) (1 diff)
• ClpSimplexDual.cpp (modified) (7 diffs)
• ClpSimplexPrimal.cpp (modified) (1 diff)

trunk/Clp/src/ClpSimplex.cpp

@@ -5313 +5313 @@
                perturbation_ = savePerturbation;
                baseIteration_ = numberIterations_;
+               // Say second call
+               moreSpecialOptions_ |= 256;
                returnCode = static_cast<ClpSimplexPrimal *> (this)->primal(0);
+               // Say not second call
+               moreSpecialOptions_ &= ~256;
                baseIteration_ = 0;
                computeObjectiveValue();

trunk/Clp/src/ClpSimplexDual.cpp

@@ -5814 +5814 @@
           int status = fastDual(alwaysFinish);
           CoinAssert (problemStatus_ || objectiveValue_ < 1.0e50);
+#ifdef CLP_DEBUG
+          printf("first status %d obj %g\n",problemStatus_,objectiveValue_);
+#endif
+          if(problemStatus_==10) 
+              problemStatus_=3;
           // make sure plausible
           double obj = CoinMax(objectiveValue_, saveObjectiveValue);
@@ -5826 +5831 @@
                status = problemStatus_;
           }
+          if (problemStatus_ == 3)
+               status = 2;
           if (status || (problemStatus_ == 0 && !isDualObjectiveLimitReached())) {
                objectiveChange = obj - saveObjectiveValue;
@@ -5832 +5839 @@
                status = 1;
           }
-          if (problemStatus_ == 3)
-               status = 2;
 
           if (scalingFlag_ <= 0) {
@@ -5879 +5884 @@
           // Start of fast iterations
           status = fastDual(alwaysFinish);
+          CoinAssert (problemStatus_||objectiveValue_<1.0e50);
+#ifdef CLP_DEBUG
+          printf("second status %d obj %g\n",problemStatus_,objectiveValue_);
+#endif
+          if(problemStatus_==10) 
+              problemStatus_=3;
           // make sure plausible
           obj = CoinMax(objectiveValue_, saveObjectiveValue);
@@ -5891 +5902 @@
                status = problemStatus_;
           }
+          if (problemStatus_ == 3)
+               status = 2;
           if (status || (problemStatus_ == 0 && !isDualObjectiveLimitReached())) {
                objectiveChange = obj - saveObjectiveValue;
@@ -5897 +5910 @@
                status = 1;
           }
-          if (problemStatus_ == 3)
-               status = 2;
           if (scalingFlag_ <= 0) {
                CoinMemcpyN(solution_, numberColumns_, outputSolution[iSolution]);
@@ -7142 +7153 @@
                          jSequence -= numberColumns_;
                     }
+#ifdef CLP_INVESTIGATE
                     double lowerValue = tempLower[iSequence];
                     double upperValue = tempUpper[iSequence];
-#ifdef CLP_INVESTIGATE
                     printf("*** movement>1.0e30 for  %c%d %g <= %g <= %g true %g, %g - status %d\n",
                            RC, jSequence, lower_[iSequence], solution_[iSequence],

trunk/Clp/src/ClpSimplexPrimal.cpp

@@ -1456 +1456 @@
           problemStatus_ = 10; // try dual
           // See if second call
-          if ((moreSpecialOptions_ & 256) != 0) {
+          if ((moreSpecialOptions_ & 256) != 0||nonLinearCost_->numberInfeasibilities()>1.0e2) {
                numberPrimalInfeasibilities_ = nonLinearCost_->numberInfeasibilities();
                sumPrimalInfeasibilities_ = nonLinearCost_->sumInfeasibilities();