1.1 --- a/tests/benchmark_tools.h	Sun Dec 11 07:33:29 2011 +0100
     1.2 +++ b/tests/benchmark_tools.h	Sun Dec 11 11:19:39 2011 +0100
     1.3 @@ -6,16 +6,29 @@
     1.4  #include<iomanip>
     1.5  #include<lemon/time_measure.h>
     1.6  
     1.7 -extern const char test_name[];
     1.8 +extern std::string test_name;
     1.9 +extern std::string instance_name;
    1.10  
    1.11 -inline void logTime(const std::string &subtest_name, const
    1.12 -                    lemon::TimeStamp &time)
    1.13 +extern const std::string DATADIR_PATH;
    1.14 +
    1.15 +
    1.16 +inline void logTime(const std::string &_instance_name,
    1.17 +		    const std::string &subtest_name,
    1.18 +		    const lemon::TimeStamp &time)
    1.19  {
    1.20 -  std::cout << "*** " << test_name << ' ' << subtest_name << ' '
    1.21 -	    << std::setiosflags(std::ios::fixed) << std::setprecision(4)
    1.22 +  std::cout << "*** " << test_name
    1.23 +	    << ' ' << _instance_name
    1.24 +	    << ' ' << subtest_name
    1.25 +	    << ' ' << std::setiosflags(std::ios::fixed) << std::setprecision(4)
    1.26  	    << time.realTime() << ' '
    1.27              << time.realTime()/(time.userTime()+time.systemTime()) - 1.0
    1.28              << std::endl;
    1.29  }
    1.30  
    1.31 +inline void logTime(const std::string &subtest_name,
    1.32 +		    const lemon::TimeStamp &time)
    1.33 +{
    1.34 +  logTime(instance_name,subtest_name,time);
    1.35 +}
    1.36 +
    1.37  #endif