Changeset 1851

Timestamp:

Mar 22, 2012 11:21:43 AM (9 years ago)

Author:

forrest

Message:

changes to parametrics

Location:

trunk/Clp/src

Files:

• ClpSimplexOther.cpp (modified) (4 diffs)
• ClpSimplexOther.hpp (modified) (1 diff)

trunk/Clp/src/ClpSimplexOther.cpp

@@ -2049 +2049 @@
                  paramData.startingTheta=startingTheta;
                  paramData.endingTheta=endingTheta;
+                 paramData.maxTheta=COIN_DBL_MAX;
                  paramData.lowerChange = chgLower;
                  paramData.upperChange = chgUpper;
@@ -3020 +3021 @@
     returnCode = -2;
   }
+  paramData.maxTheta=maxTheta;
   bool swapped=false;
   // Dantzig 
@@ -3681 +3683 @@
               double saveTheta=theta_;
               theta_ = endingTheta;
+              if (problemStatus_==2&&theta_>0.99999999*paramData.maxTheta)
+                theta_=COIN_DBL_MAX; // we have finished
               int status=eventHandler_->event(ClpEventHandler::theta);
               if (status>=0&&status<10) {
                 endingTheta=theta_;
-                theta_=saveTheta;
                 problemStatus_=-1;
                 continue;
@@ -3692 +3695 @@
                 if (status<0)
                   startingTheta = useTheta;
-                theta_=saveTheta;
               }
+              theta_=saveTheta;
             }
 #else

trunk/Clp/src/ClpSimplexOther.hpp

@@ -108 +108 @@
     double startingTheta;
     double endingTheta;
+    double maxTheta;
     double * lowerChange; // full array of lower bound changes
     int * lowerList; // list of lower bound changes