Changeset 1623 for trunk/Cbc/src/CbcSolver.cpp
- Timestamp:
- Mar 25, 2011 3:05:04 PM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Cbc/src/CbcSolver.cpp
r1622 r1623 1193 1193 } 1194 1194 double time0; 1195 double time0Elapsed = CoinGetTimeOfDay(); 1195 1196 { 1196 1197 double time1 = CoinCpuTime(), time2; … … 1746 1747 numberGoodCommands++; 1747 1748 if (type == CBC_PARAM_ACTION_BAB && goodModel) { 1749 if (model_.useElapsedTime()) 1748 1750 model_.setDblParam(CbcModel::CbcStartSeconds, CoinGetTimeOfDay()); 1751 else 1752 model_.setDblParam(CbcModel::CbcStartSeconds, CoinCpuTime()); 1749 1753 // check if any integers 1750 1754 #ifndef CBC_OTHER_SOLVER … … 2245 2249 crossover = action; 2246 2250 break; 2251 case CLP_PARAM_STR_TIME_MODE: 2252 model_.setUseElapsedTime(action!=0); 2253 break; 2247 2254 case CBC_PARAM_STR_SOS: 2248 2255 doSOS = action; … … 2694 2701 sprintf(generalPrint + strlen(generalPrint), 2695 2702 "Time (Wallclock Seconds): %.2f\n", 2696 model_.getCurrentSeconds());2703 CoinGetTimeOfDay()-time0Elapsed); 2697 2704 #endif 2698 2705 generalMessageHandler->message(CLP_GENERAL, generalMessages)
Note: See TracChangeset
for help on using the changeset viewer.