Changeset 11:cf6519daa7fa in lemon-benchmark for tests/circulation.cc

Timestamp:

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

Author:

Alpar Juttner <alpar@…>

Branch:

default

Phase:

public

Message:

Refactoring and test instance in test logs

File:

• tests/circulation.cc (modified) (3 diffs)

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;