Consider warmup for loaded data, too

Signed-off-by: Stefan Marr <git@stefan-marr.de>
smarr · Apr 23, 2019 · 4261791 · 4261791
1 parent 63120bb
commit 4261791
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/rebench/model/run_id.py b/rebench/model/run_id.py
@@ -178,20 +178,19 @@ def close_files(self):
         for persistence in self._persistence:
             persistence.close()
 
-    def _new_data_point(self, data_point):
+    def _new_data_point(self, data_point, warmup):
         self._max_invocation = max(self._max_invocation, data_point.invocation)
         if self._total_unit is None:
             self._total_unit = data_point.get_total_unit()
+        if not warmup:
+            self._statistics.add_sample(data_point.get_total_value())
 
-    def loaded_data_point(self, data_point):
-        self._new_data_point(data_point)
-        self._statistics.add_sample(data_point.get_total_value())
+    def loaded_data_point(self, data_point, warmup):
+        self._new_data_point(data_point, warmup)
 
     def add_data_point(self, data_point, warmup):
-        self._new_data_point(data_point)
+        self._new_data_point(data_point, warmup)
 
-        if not warmup:
-            self._statistics.add_sample(data_point.get_total_value())
         for persistence in self._persistence:
             persistence.persist_data_point(data_point)
 

diff --git a/rebench/persistence.py b/rebench/persistence.py
@@ -167,7 +167,8 @@ def _process_lines(self, data_file, runs, filtered_data_file):
                 data_point.add_measurement(measurement)
 
                 if measurement.is_total():
-                    run_id.loaded_data_point(data_point)
+                    run_id.loaded_data_point(data_point,
+                                             measurement.iteration <= run_id.warmup_iterations)
                     data_point = DataPoint(run_id)
 
             except ValueError as err:

diff --git a/rebench/tests/model/runs_config_test.py b/rebench/tests/model/runs_config_test.py
@@ -43,12 +43,12 @@ def test_termination_check_basic(self):
         for i in range(1, 10):
             dp = DataPoint(self._run)
             dp.add_measurement(Measurement(i, 1, 0, 'ms', self._run))
-            self._run.loaded_data_point(dp)
+            self._run.loaded_data_point(dp, False)
         self.assertFalse(check.should_terminate(0))
 
         dp = DataPoint(self._run)
         dp.add_measurement(Measurement(10, 1, 0, 'ms', self._run))
-        self._run.loaded_data_point(dp)
+        self._run.loaded_data_point(dp, False)
         self.assertTrue(check.should_terminate(0))
 
     def test_terminate_not_determine_by_number_of_data_points(self):