Changeset 673

Timestamp:

Jul 3, 2007 10:32:37 AM (12 years ago)

Author:

forrest

Message:

try and fix time on some computers

File:

• branches/devel/Cbc/src/CbcModel.cpp (modified) (6 diffs)

branches/devel/Cbc/src/CbcModel.cpp

@@ -63 +63 @@
 
 #include "CoinTime.hpp"
+static inline double CoinCpuTimeJustChildren()
+{
+  double cpu_temp;
+#if defined(_MSC_VER) || defined(__MSVCRT__)
+  unsigned int ticksnow;        /* clock_t is same as int */
+  
+  ticksnow = (unsigned int)clock();
+  
+  cpu_temp = (double)((double)ticksnow/CLOCKS_PER_SEC);
+#else
+  struct rusage usage;
+# ifdef ZEROFAULT
+  usage.ru_utime.tv_sec = 0 ;
+  usage.ru_utime.tv_usec = 0 ;
+# endif
+  getrusage(RUSAGE_CHILDREN,&usage);
+  cpu_temp = usage.ru_utime.tv_sec;
+  cpu_temp += 1.0e-6*((double) usage.ru_utime.tv_usec);
+#endif
+  return cpu_temp;
+}
 #include "CoinMpsIO.hpp"
 
@@ -1575 +1596 @@
   Check for abort on limits: node count, solution count, time, integrality gap.
 */
-    totalTime = CoinCpuTime()-dblParam_[CbcStartSeconds] ;
+    totalTime = getCurrentSeconds() ;
     if (!(numberNodes_ < intParam_[CbcMaxNumNode] &&
           numberSolutions_ < intParam_[CbcMaxNumSol] &&
@@ -2230 +2251 @@
     for (i=0;i<numberThreads_;i++) 
       time += threadInfo[i].timeInThread;
-    bool goodTimer = time<(CoinCpuTime() - dblParam_[CbcStartSeconds]);
+    bool goodTimer = time<(getCurrentSeconds());
     for (i=0;i<numberThreads_;i++) {
       while (threadInfo[i].returnCode==0) {
@@ -2287 +2308 @@
     delete [] threadCount;
     mutex_=NULL;
+    // adjust time to allow for children on some systems
+    dblParam_[CbcStartSeconds] -= CoinCpuTimeJustChildren();
   }
 #endif
@@ -4526 +4549 @@
   sumChangeObjective1_ += solver_->getObjValue()*solver_->getObjSense()
     - objectiveValue ;
-  if ( CoinCpuTime()-dblParam_[CbcStartSeconds] > dblParam_[CbcMaximumSeconds] )
+  if ( getCurrentSeconds() > dblParam_[CbcMaximumSeconds] )
     numberTries=0; // exit
   //if ((numberNodes_%100)==0)
@@ -5307 +5330 @@
       }
       feasible = resolve(node ? node->nodeInfo() : NULL,2) ;
-      if ( CoinCpuTime()-dblParam_[CbcStartSeconds] > dblParam_[CbcMaximumSeconds] )
+      if ( getCurrentSeconds() > dblParam_[CbcMaximumSeconds] )
         numberTries=0; // exit
 #     ifdef CBC_DEBUG