Changeset 1623 for trunk

Timestamp:

Mar 25, 2011 3:05:04 PM (9 years ago)

Author:

forrest

Message:

allow for elapsed time on unix

Location:

trunk/Cbc/src

Files:

• CbcModel.cpp (modified) (7 diffs)
• CbcModel.hpp (modified) (3 diffs)
• CbcSolver.cpp (modified) (4 diffs)

trunk/Cbc/src/CbcModel.cpp

@@ -1572 +1572 @@
 {
     /*
-      Capture a time stamp before we start.
+      Capture a time stamp before we start (unless set).
     */
-    dblParam_[CbcStartSeconds] = CoinGetTimeOfDay();
+    if (!dblParam_[CbcStartSeconds]) {
+      if (!useElapsedTime())
+        dblParam_[CbcStartSeconds] = CoinCpuTime();
+      else
+        dblParam_[CbcStartSeconds] = CoinGetTimeOfDay();
+    }
     dblParam_[CbcSmallestChange] = COIN_DBL_MAX;
     dblParam_[CbcSumChange] = 0.0;
@@ -5972 +5977 @@
     bool sameProblem = false;
     if ((specialOptions_&4096) == 0) {
+#if 0
         {
             int n1 = numberRowsAtContinuous_;
@@ -5981 +5987 @@
             //printf("ROWS a %d - old thinks %d new %d\n",solver_->getNumRows(),n1,n2);
         }
+#endif
         int nDel = 0;
         int nAdd = 0;
@@ -6687 +6694 @@
             assert (jObject < numberObjects_ && iObject == jObject);
 #else
-#ifdef TIGHTEN_BOUNDS
+#ifdef CBCMODEL_TIGHTEN_BOUNDS
             int iColumn = simpleObject->columnNumber();
 #endif
@@ -6694 +6701 @@
             // Care! We must be careful not to update the same variable in parallel threads.
             addUpdateInformation(update);
-            //#define TIGHTEN_BOUNDS
-#ifdef TIGHTEN_BOUNDS
+            //#define CBCMODEL_TIGHTEN_BOUNDS
+#ifdef CBCMODEL_TIGHTEN_BOUNDS
             double cutoff = getCutoff() ;
             if (feasible && cutoff < 1.0e20) {
@@ -7317 +7324 @@
             if ( maximumSecondsReached() ) {
                 numberTries = 0; // exit
+                feasible = false;
                 break;
             }
@@ -12185 +12193 @@
 CbcModel::getCurrentSeconds() const
 {
-    return CoinGetTimeOfDay() - getDblParam(CbcStartSeconds);
+    if (!useElapsedTime())
+      return CoinCpuTime() - getDblParam(CbcStartSeconds);
+    else
+      return CoinGetTimeOfDay() - getDblParam(CbcStartSeconds);
 }
 /* Encapsulates choosing a variable -

trunk/Cbc/src/CbcModel.hpp

@@ -1737 +1737 @@
         32768 more heuristics in sub trees
         65536 no cuts in preprocessing
+        131072 Time limits elapsed
     */
     inline void setMoreSpecialOptions(int value) {
@@ -1744 +1745 @@
     inline int moreSpecialOptions() const {
         return moreSpecialOptions_;
+    }
+  /// Set time method
+    inline void setUseElapsedTime(bool yesNo) {
+        if (yesNo)
+          moreSpecialOptions_ |= 131072;
+        else
+          moreSpecialOptions_ &= ~131072;
+    }
+    /// Get time method
+    inline bool useElapsedTime() const {
+        return (moreSpecialOptions_&131072)!=0;
     }
     /// Go to dantzig pivot selection if easy problem (clp only)
@@ -2436 +2448 @@
     int specialOptions_;
     /** More special options
-        at present bottom 3 bits used for shadow price mode
+        at present bottom 6 bits used for shadow price mode
+        1024 for experimental hotstart
+        2048,4096 breaking out of cuts
+        8192 slowly increase minimum drop
+        16384 gomory
+        32768 more heuristics in sub trees
+        65536 no cuts in preprocessing
+        131072 Time limits elapsed
     */
     int moreSpecialOptions_;

trunk/Cbc/src/CbcSolver.cpp

@@ -1193 +1193 @@
     }
     double time0;
+    double time0Elapsed = CoinGetTimeOfDay();
     {
         double time1 = CoinCpuTime(), time2;
@@ -1746 +1747 @@
                 numberGoodCommands++;
                 if (type == CBC_PARAM_ACTION_BAB && goodModel) {
+                  if (model_.useElapsedTime())
                     model_.setDblParam(CbcModel::CbcStartSeconds, CoinGetTimeOfDay());
+                  else
+                    model_.setDblParam(CbcModel::CbcStartSeconds, CoinCpuTime());
                     // check if any integers
 #ifndef CBC_OTHER_SOLVER
@@ -2245 +2249 @@
                             crossover = action;
                             break;
+                        case CLP_PARAM_STR_TIME_MODE:
+                            model_.setUseElapsedTime(action!=0);
+                            break;
                         case CBC_PARAM_STR_SOS:
                             doSOS = action;
@@ -2694 +2701 @@
                                    sprintf(generalPrint + strlen(generalPrint),
                                            "Time (Wallclock Seconds):   %.2f\n", 
-                                           model_.getCurrentSeconds());
+                                           CoinGetTimeOfDay()-time0Elapsed);
 #endif
                                    generalMessageHandler->message(CLP_GENERAL, generalMessages)