Changeset 2243:5deb7b22a0ec in lemon-0.x

Timestamp:

10/17/06 12:31:20 (18 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2993

Message:

Change for better measurement very fast operations (enable a higher
number of iterations in runningTimeTest())

Files:

• lemon/time_measure.h (modified) (1 diff)
• test/time_measure_test.cc (modified) (1 diff)

lemon/time_measure.h

@@ -518 +518 @@
   
   template<class F>
-  TimeStamp runningTimeTest(F f,double min_time=10,int *num = NULL,
+  TimeStamp runningTimeTest(F f,double min_time=10,unsigned int *num = NULL,
                             TimeStamp *full_time=NULL)
   {
+    TimeStamp full;
+    unsigned int total=0;
     Timer t;
-    TimeStamp full;
-    int total=0;
-    for(int tn=1;tn < 1<<30; tn*=2) {
+    for(unsigned int tn=1;tn <= 1<<31 && full.realTime()<=min_time; tn*=2) {
       for(;total<tn;total++) f();
       full=t;
-      if(full.realTime()>min_time) {
-        if(num) *num=total;
-        if(full_time) *full_time=full;
-      return full/total;
-      }
-    }
-    return TimeStamp();
+    }
+    if(num) *num=total;
+    if(full_time) *full_time=full;
+    return full/total;
   }
   

test/time_measure_test.cc

@@ -44 +44 @@
 {
   Timer T;
-  int n;
+  unsigned int n;
   for(n=0;T.realTime()<1.0;n++) ;
   std::cout << T << " (" << n << " time queries)\n";