From de8f034c210691e4dc8a5725159f3897cd01c315 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Oberhuber?= <oberhuber.tomas@gmail.com>
Date: Fri, 21 Dec 2018 22:20:28 +0100
Subject: [PATCH] Changing minTime in Benchmark from int to double.
---
src/Benchmarks/Benchmarks.h | 13 +++++++------
src/Benchmarks/Traversers/GridTraversersBenchmark.h | 12 +++++-------
2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/src/Benchmarks/Benchmarks.h b/src/Benchmarks/Benchmarks.h
index 13ba3a6d16..61452d0748 100644
--- a/src/Benchmarks/Benchmarks.h
+++ b/src/Benchmarks/Benchmarks.h
@@ -41,7 +41,7 @@ double
timeFunction( ComputeFunction compute,
ResetFunction reset,
int loops,
- int minTime,
+ const double& minTime,
Monitor && monitor = Monitor() )
{
// the timer is constructed zero-initialized and stopped
@@ -56,7 +56,7 @@ timeFunction( ComputeFunction compute,
int i;
for( i = 0;
- i < loops || timer.getRealTime() < ( double ) minTime;
+ i < loops || timer.getRealTime() < minTime;
++i)
{
// abuse the monitor's "time" for loops
@@ -330,13 +330,13 @@ public:
static void configSetup( Config::ConfigDescription& config )
{
config.addEntry< int >( "loops", "Number of iterations for every computation.", 10 );
- config.addEntry< int >( "min-time", "Minimal real time in seconds for every computation.", 1 );
+ config.addEntry< double >( "min-time", "Minimal real time in seconds for every computation.", 1 );
}
void setup( const Config::ParameterContainer& parameters )
{
this->loops = parameters.getParameter< unsigned >( "loops" );
- this->minTime = parameters.getParameter< unsigned >( "min-time" );
+ this->minTime = parameters.getParameter< double >( "min-time" );
const unsigned verbose = parameters.getParameter< unsigned >( "verbose" );
Logging::setVerbose( verbose );
}
@@ -348,7 +348,7 @@ public:
this->loops = loops;
}
- void setMinTime( int minTime )
+ void setMinTime( const double& minTime )
{
this->minTime = minTime;
}
@@ -507,7 +507,8 @@ public:
}
protected:
- int loops, minTime = 1;
+ int loops = 1;
+ double minTime = 1;
double datasetSize = 0.0;
double baseTime = 0.0;
Solvers::IterativeSolverMonitor< double, int > monitor;
diff --git a/src/Benchmarks/Traversers/GridTraversersBenchmark.h b/src/Benchmarks/Traversers/GridTraversersBenchmark.h
index 6f1019deba..dcb6f5fdd3 100644
--- a/src/Benchmarks/Traversers/GridTraversersBenchmark.h
+++ b/src/Benchmarks/Traversers/GridTraversersBenchmark.h
@@ -65,23 +65,21 @@ class GridTraversersBenchmark< 1, Device, Real, Index >
{
class EntitiesProcessor
{
-
};
-
+
class UserData
{
-
};
-
+
Traverser traverser;
/*traverser.template processAllEntities< UserData, EntitiesProcessor >
( meshPointer,
userData );*/
-
+
}
-
+
protected:
-
+
Index size;
Vector v;
Grid grid;
--
GitLab