Changeset 10:d7ce0311ece2 in lemon-benchmark

Timestamp:

12/11/11 07:33:29 (13 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Phase:

public

Message:

Some common benchmarking tools added

Location:

tests

Files:

• CMakeLists.txt (modified) (1 diff)
• benchmark_tools.h (added)
• circulation.cc (modified) (3 diffs)
• main.cc (added)

tests/CMakeLists.txt

@@ -9 +9 @@
 
 ADD_EXECUTABLE(circulation
-        circulation.cc
+        circulation.cc main.cc
 )
 

tests/circulation.cc

@@ +1 @@
+#include <benchmark_tools.h>
 #include <lemon/circulation.h>
 #include <lemon/smart_graph.h>
 #include <lemon/lgf_reader.h>
 #include <lemon/dimacs.h>
-#include <lemon/time_measure.h>
 #include <lemon/error.h>
 
@@ -10 +10 @@
 using namespace lemon;
 
-int main(int argc, char **argv)
+int testMain(int argc, char **argv)
 {
   if(argc!=2) exit(1);
@@ -32 +32 @@
     return 1;
   }
-  std::cerr << "Read the file: " << ti << '\n';
+  logTime("file-read",ti);
+
+  Timer tf;
   ti.restart();
-  
   Circulation<SmartDigraph,
     SmartDigraph::ArcMap<Value>,SmartDigraph::ArcMap<Value>,
     SmartDigraph::NodeMap<Value> > circ(g,lo_cap,up_cap,sup);
-  std::cerr << "Setup Circulation class: " << ti << '\n';
+  logTime("setup",ti);
   ti.restart();
   bool res = circ.run();
+  logTime("alg",ti);
+  logTime("full",tf);
   if(res)
     {
-      std::cerr << "A feasible circulation is found: " << ti << "\n";
+      std::cerr << "A feasible circulation is found\n";
+      std::cerr << "Checking...\n";
       ti.restart();
       bool res2 = circ.checkFlow();
-      std::cerr << "Checked in time " << ti << "\n";
+      logTime("check",ti);
       if(res2)
-        std::cerr << "Success!\nn";
+        std::cerr << "Success!\n";
       else
-        std::cerr << "Oops!!!!\n\n";
+        std::cerr << "Oops!!!!\n";
     }
   else
     {
-      std::cerr << "A dual solution is found: " << ti << "\n";
+      std::cerr << "A dual solution is found\n";
+      std::cerr << "Checking...\n";
       ti.restart();
       bool res2 = circ.checkBarrier();
-      std::cerr << "Checked in time " << ti << "\n";
+      logTime("check",ti);
       if(res2)
-        std::cerr << "Success!\nn";
+        std::cerr << "Success!\n";
       else
-        std::cerr << "Dual-Oops!!!!\n\n";
+        std::cerr << "Dual-Oops!!!!\n";
 
     }