Commit 5abc0c5c authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Benchmarks: refactored verbose flag

parent d416a598

src/Benchmarks/Benchmark.hpp

+6 −6
Original line number Diff line number Diff line
@@ -173,15 +173,15 @@ time( ResetFunction reset, 
         // run the monitor main loop

         Solvers::SolverMonitorThread monitor_thread( monitor );

         if( this->reset )

            std::tie( result.time, result.stddev ) = functionTimer.timeFunction( compute, reset, loops, minTime, Logger::verbose, monitor );

            std::tie( result.time, result.stddev ) = functionTimer.timeFunction( compute, reset, loops, minTime, monitor );

         else

            std::tie( result.time, result.stddev ) = functionTimer.timeFunction( compute, loops, minTime, Logger::verbose, monitor );

            std::tie( result.time, result.stddev ) = functionTimer.timeFunction( compute, loops, minTime, monitor );

      }

      else {

         if( this->reset )

            std::tie( result.time, result.stddev ) = functionTimer.timeFunction( compute, reset, loops, minTime, Logger::verbose, monitor );

            std::tie( result.time, result.stddev ) = functionTimer.timeFunction( compute, reset, loops, minTime, monitor );

         else

            std::tie( result.time, result.stddev ) = functionTimer.timeFunction( compute, loops, minTime, Logger::verbose, monitor );

            std::tie( result.time, result.stddev ) = functionTimer.timeFunction( compute, loops, minTime, monitor );

      }

      this->performedLoops = functionTimer.getPerformedLoops();

   }
@@ -230,10 +230,10 @@ time( const String & performer, 
      if( Logger::verbose > 1 ) {

         // run the monitor main loop

         Solvers::SolverMonitorThread monitor_thread( monitor );

         std::tie( result.time, result.stddev ) = functionTimer.timeFunction( compute, loops, minTime, Logger::verbose, monitor );

         std::tie( result.time, result.stddev ) = functionTimer.timeFunction( compute, loops, minTime, monitor );

      }

      else {

         std::tie( result.time, result.stddev ) = functionTimer.timeFunction( compute, loops, minTime, Logger::verbose, monitor );

         std::tie( result.time, result.stddev ) = functionTimer.timeFunction( compute, loops, minTime, monitor );

      }

   }

   catch ( const std::exception& e ) {

src/Benchmarks/FunctionTimer.h

+2 −5
Original line number Diff line number Diff line
@@ -37,14 +37,12 @@ public: 
                 ResetFunction reset,

                 int maxLoops,

                 const double& minTime,

                 int verbose = 1,

                 Monitor && monitor = Monitor() )

   {

      // the timer is constructed zero-initialized and stopped

      Timer timer;



      // set timer to the monitor

      if( verbose > 1 )

      monitor.setTimer( timer );



      // warm up
@@ -100,11 +98,10 @@ public: 
   timeFunction( ComputeFunction compute,

                 int maxLoops,

                 const double& minTime,

                 int verbose = 1,

                 Monitor && monitor = Monitor() )

   {

      auto noReset = [] () {};

      return timeFunction( compute, noReset, maxLoops, minTime, verbose, monitor );

      return timeFunction( compute, noReset, maxLoops, minTime, monitor );

   }



   int getPerformedLoops() const

src/Benchmarks/Logging.h

+6 −1
Original line number Diff line number Diff line
@@ -101,6 +101,11 @@ public: 
      this->verbose = verbose;

   }



   int getVerbose() const

   {

      return verbose;

   }



   virtual void writeTitle( const String & title ) = 0;



   virtual void addCommonLogs( const CommonLogs& logs ) = 0;