Changeset 1847:7cbc12e42482 in lemon-0.x

Timestamp:

12/05/05 18:03:31 (18 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

• Changed and improved Timer interface
  • several new member functions
  • reset() -> restart() renaming
  • TimeReport?: a Timer that prints a report on destruction.
• counter.h: a tool to measure the number of streps of algorithms.
• New documentation module for time measuring and counting.

Files:

• benchmark/bfs-bench.cc (modified) (4 diffs)
• benchmark/graph-bench.cc (modified) (1 diff)
• benchmark/hcube.cc (modified) (4 diffs)
• doc/groups.dox (modified) (1 diff)
• lemon/Makefile.am (modified) (1 diff)
• lemon/counter.h (added)
• lemon/simann.h (modified) (2 diffs)
• lemon/time_measure.h (modified) (11 diffs)
• test/Makefile.am (modified) (2 diffs)
• test/counter_test.cc (added)
• test/time_measure_test.cc (modified) (1 diff)

benchmark/bfs-bench.cc

@@ -115 +115 @@
 //        << dim*(1<<dim) << " edges):";
 
-  T.reset();
+  T.restart();
   vector<Node> nodes;
   addBiDirHyperCube(G,dim,nodes);
@@ -121 +121 @@
   PrintTime("GENGRAPH",T);
 
-  T.reset();
+  T.restart();
   {
     for(int i=0;i<mul;i++)
@@ -127 +127 @@
   }
   PrintTime("BFS-STL",T);
-  T.reset();
+  T.restart();
   {
     for(int i=0;i<mul;i++)
@@ -133 +133 @@
   }
   PrintTime("BFS-OWN",T);
-  T.reset();
+  T.restart();
   {
     for(int i=0;i<mul;i++)

benchmark/graph-bench.cc

@@ -49 +49 @@
   
   PrintTime("BIG",T);
-  T.reset();
+  T.restart();
   makeFullGraph<ListGraph>(nextPrim(100),nextPrim(30000),nextPrim(150));
 

benchmark/hcube.cc

@@ -53 +53 @@
 //        << dim*(1<<dim) << " edges):";
 
-  T.reset();
+  T.restart();
   vector<Node> nodes;
   addBiDirHyperCube(G,dim,nodes);
@@ -59 +59 @@
   PrintTime("GENGRAPH",T);
 
-  T.reset();
+  T.restart();
   Graph::EdgeMap<int> map(G);
   for(int i=0;i<5;i++) {
@@ -85 +85 @@
   PrintTime("GENLENGTHS",T);
 
-  T.reset();
+  T.restart();
   {
     Dijkstra<Graph> Dij(G,map);
@@ -93 +93 @@
   PrintTime("DIJKSTRA",T);
 
-  T.reset();
+  T.restart();
   {
    Graph::EdgeMap<int> flow(G);

doc/groups.dox

@@ -144 +144 @@
 
 /**
+@defgroup timecount Time measuring and Counting
+@ingroup misc
+Here you can find simple tools for measuring the performance
+of algorithms.
+*/
+
+/**
 @defgroup io_group Input Output
 Here you can find tools for imporing and exporting graphs and graph related

lemon/Makefile.am

@@ -28 +28 @@
         bin_heap.h \
         config.h \
+        counter.h \
         dijkstra.h \
         dimacs.h \

lemon/simann.h

@@ -5 +5 @@
 /// \file
 /// \brief Simulated annealing framework.
+///
+/// \todo A test and some demo should be added
+/// \todo Doc should be improved
 /// \author Akos Ladanyi
 
@@ -299 +302 @@
           temp = 10000.0;
           warmup = false;
-          timer.reset();
+          timer.restart();
         }
       }

lemon/time_measure.h

@@ -18 +18 @@
 #define LEMON_TIME_MEASURE_H
 
-///\ingroup misc
+///\ingroup timecount
 ///\file
 ///\brief Tools for measuring cpu usage
@@ -30 +30 @@
 namespace lemon {
 
-  /// \addtogroup misc
+  /// \addtogroup timecount
   /// @{
 
@@ -210 +210 @@
   ///  doSomething();
   ///  std::cout << T << '\n';
-  ///  T.reset();
+  ///  T.restart();
   ///  doSomethingElse();
   ///  std::cout << T << '\n';
@@ -224 +224 @@
   ///
   ///\warning Depending on the operation system and its actual configuration
-  ///the time counters have a certain (relatively big) granularity.
+  ///the time counters have a certain (10ms on a typical Linux system)
+  ///granularity.
   ///Therefore this tool is not appropriate to measure very short times.
   ///Also, if you start and stop the timer very frequently, it could lead
@@ -239 +240 @@
   class Timer
   {
-    int running; //Timer is running iff running>0; (running>=0 always holds)
+    int _running; //Timer is running iff _running>0; (_running>=0 always holds)
     TimeStamp start_time; //This is the relativ start-time if the timer
-                          //is running, the collected running time otherwise.
-    
-    void _reset() {if(running) start_time.stamp(); else start_time.reset();}
+                          //is _running, the collected _running time otherwise.
+    
+    void _reset() {if(_running) start_time.stamp(); else start_time.reset();}
   
   public: 
@@ -250 +251 @@
     ///\param _running indicates whether or not the timer starts immediately.
     ///
-    Timer(bool _running=true) :running(_running) {_reset();}
+    Timer(bool run=true) :_running(run) {_reset();}
 
     ///Computes the ellapsed time
@@ -260 +261 @@
       TimeStamp t;
       t.stamp();
-      return running?t-start_time:start_time;
-    }
-
-    ///Resets the time counters
-
-    ///Resets the time counters
-    ///
+      return _running?t-start_time:start_time;
+    }
+
+    ///Reset and stop the time counters
+
+    ///This function resets and stops the time counters
+    ///\sa restart()
     void reset()
     {
+      _running=0;
       _reset();
     }
@@ -281 +283 @@
     void start() 
     {
-      if(running) running++;
+      if(_running) _running++;
       else {
         TimeStamp t;
@@ -288 +290 @@
       }
     }
+
     
     ///Stop the time counters
 
-    ///This function stops the time counters.
-    ///
-    ///\sa stop()
+    ///This function stops the time counters. If start() was executed more than
+    ///once, then the same number of stop() execution is necessary the really
+    ///stop the timer.
+    /// 
+    ///\sa halt()
+    ///\sa start()
+    ///\sa restart()
+    ///\sa reset()
+
     void stop() 
     {
-      if(running && !--running) {
+      if(_running && !--_running) {
         TimeStamp t;
         t.stamp();
@@ -302 +311 @@
       }
     }
+
+    ///Halt (i.e stop immediately) the time counters
+
+    ///This function stops immediately the time counters.
+    ///
+    ///\sa stop()
+    ///\sa restart()
+    ///\sa reset()
+
+    void halt() 
+    {
+      if(_running) {
+        _running=0;
+        TimeStamp t;
+        t.stamp();
+        start_time=t-start_time;
+      }
+    }
+
+    ///Returns the running state of the timer
+
+    ///This function returns the number of stop() exections that is
+    ///necessary to really stop the timer.
+    ///For example the timer
+    ///is running if and only if the return value is \c true
+    ///(i.e. greater than
+    ///zero).
+    int running()  { return _running; }
+    
+    
+    ///Restart the time counters
+
+    ///This function is a shorthand for
+    ///a reset() and a start() calls.
+    ///
+    void restart() 
+    {
+      reset();
+      start();
+    }
     
     ///Gives back the ellapsed user time of the process
@@ -331 +380 @@
   };
 
+  ///Same as \ref Timer but prints a report on destruction.
+
+  ///Same as \ref Timer but prints a report on destruction.
+  ///\todo Untested
+  class TimeReport : public Timer 
+  {
+    std::string _title;
+    std::ostream &_os;
+  public:
+    ///\e
+    
+    TimeReport(std::string title,std::ostream &os,bool run) 
+      : Timer(run), _title(title), _os(os){}
+    ~TimeReport() 
+    {
+      _os << _title << this << std::endl;
+    }
+  };
+      
   ///Prints the time counters
 

test/Makefile.am

@@ -14 +14 @@
         all_pairs_shortest_path_test \
         bfs_test \
+        counter_test \
         dfs_test \
         dijkstra_test \
@@ -49 +50 @@
 all_pairs_shortest_path_test_SOURCES = all_pairs_shortest_path_test.cc
 bfs_test_SOURCES = bfs_test.cc
+counter_test_SOURCES = counter_test.cc
 dfs_test_SOURCES = dfs_test.cc
 dijkstra_test_SOURCES = dijkstra_test.cc

test/time_measure_test.cc

@@ -37 +37 @@
   for(n=0;T.realTime()<1.0;n++) ;
   std::cout << T << " (" << n << " time queries)\n";
-  T.reset();
+  T.restart();
   while(T.realTime()<2.0) ;
   std::cout << T << '\n';