Changeset 11:cf6519daa7fa in lemon-benchmark for tests/benchmark_tools.h

Timestamp:

12/11/11 11:19:39 (13 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Phase:

public

Message:

Refactoring and test instance in test logs

File:

• tests/benchmark_tools.h (modified) (2 diffs)

tests/benchmark_tools.h

@@ -7 +7 @@
 #include<lemon/time_measure.h>
 
-extern const char test_name[];
+extern std::string test_name;
+extern std::string instance_name;
 
-inline void logTime(const std::string &subtest_name, const
-                    lemon::TimeStamp &time)
+extern const std::string DATADIR_PATH;
+
+
+inline void logTime(const std::string &_instance_name,
+                    const std::string &subtest_name,
+                    const lemon::TimeStamp &time)
 {
-  std::cout << "*** " << test_name << ' ' << subtest_name << ' '
-            << std::setiosflags(std::ios::fixed) << std::setprecision(4)
+  std::cout << "*** " << test_name
+            << ' ' << _instance_name
+            << ' ' << subtest_name
+            << ' ' << std::setiosflags(std::ios::fixed) << std::setprecision(4)
             << time.realTime() << ' '
             << time.realTime()/(time.userTime()+time.systemTime()) - 1.0
@@ -19 +26 @@
 }
 
+inline void logTime(const std::string &subtest_name,
+                    const lemon::TimeStamp &time)
+{
+  logTime(instance_name,subtest_name,time);
+}
+
 #endif