Changeset 11:cf6519daa7fa in lemon-benchmark

Timestamp:

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

Author:

Alpar Juttner <alpar@…>

Branch:

default

Phase:

public

Message:

Refactoring and test instance in test logs

Location:

tests

Files:

• CMakeLists.txt (modified) (2 diffs)
• benchmark_tools.h (modified) (2 diffs)
• circulation.cc (modified) (3 diffs)
• file_main.cc (moved) (moved from tests/main.cc) (1 diff)
• paths.cc.cmake (added)

tests/CMakeLists.txt

@@ -1 +1 @@
 INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/tests
-  # ${CMAKE_BINARY_DIR}/src
+  ${CMAKE_BINARY_DIR}/tests
 )
 
@@ -8 +8 @@
 )
 
+SET(DATADIR_PATH ${CMAKE_BINARY_DIR}/data)
+CONFIGURE_FILE(
+  ${CMAKE_CURRENT_SOURCE_DIR}/paths.cc.cmake
+  ${CMAKE_CURRENT_BINARY_DIR}/paths.cc
+)
+
 ADD_EXECUTABLE(circulation
-        circulation.cc main.cc
+        circulation.cc file_main.cc paths.cc
 )
 

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

tests/circulation.cc

@@ -5 +5 @@
 #include <lemon/dimacs.h>
 #include <lemon/error.h>
+#include <istream>
 
-const char test_name[] = "circulation";
+std::string test_name = "circulation";
 
 using namespace lemon;
 
-int testMain(int argc, char **argv)
+int testMain(std::istream &input)
 {
-  if(argc!=2) exit(1);
-
   typedef int Value;
   
@@ -25 +24 @@
   Timer ti;
   try {
-    std::ifstream input;
-    input.open(argv[1]);
     readDimacsMin(input, g, lo_cap, up_cap, cost, sup);
   } catch (FormatError& error) {
@@ -32 +29 @@
     return 1;
   }
-  logTime("file-read",ti);
+  logTime("fread",ti);
 
   Timer tf;

tests/file_main.cc

@@ -1 +1 @@
 #include <benchmark_tools.h>
+#include <istream>
+#include <lemon/error.h>
 
 using namespace lemon;
 
-int testMain(int argc, char **argv);
+std::string instance_name;
+
+int testMain(std::istream &input);
 
 int main(int argc, char **argv)
 {
+  if(argc!=2) exit(1);
+
+  std::ifstream input;
+  input.open((DATADIR_PATH+"/"+argv[1]).c_str());
+  
+  instance_name = argv[1];
+
   Timer ti;
-  testMain(argc, argv);
+  testMain(input);
   logTime("total",ti);
 }