Changeset 1623 for trunk/Cbc/src/CbcSolver.cpp

Timestamp:

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

Author:

forrest

Message:

allow for elapsed time on unix

File:

• trunk/Cbc/src/CbcSolver.cpp (modified) (4 diffs)

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)