From: Ondrej Lichtner <olichtne(a)redhat.com>
The function is generic enough and useful enough to move it into the
lnst.RecipeCommon.Perf.Results module instead of having it as a helper
method for flow average evaluation.
Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com>
---
.../Evaluators/BaselineFlowAverageEvaluator.py | 17 +++++++----------
lnst/RecipeCommon/Perf/Results.py | 5 +++++
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/lnst/RecipeCommon/Perf/Evaluators/BaselineFlowAverageEvaluator.py
b/lnst/RecipeCommon/Perf/Evaluators/BaselineFlowAverageEvaluator.py
index 3f49ab0..ae53bed 100644
--- a/lnst/RecipeCommon/Perf/Evaluators/BaselineFlowAverageEvaluator.py
+++ b/lnst/RecipeCommon/Perf/Evaluators/BaselineFlowAverageEvaluator.py
@@ -6,6 +6,7 @@ from ..Measurements.BaseFlowMeasurement import (
FlowMeasurementResults,
AggregatedFlowMeasurementResults,
)
+from ..Results import result_averages_difference
class BaselineFlowAverageEvaluator(BaseEvaluator):
@@ -30,16 +31,16 @@ class BaselineFlowAverageEvaluator(BaseEvaluator):
comparison_result = False
result_text.append("No baseline found for this flow")
else:
- generator_diff = _result_averages_difference(
- result.generator_results,
- baseline.generator_results)
+ generator_diff = result_averages_difference(
+ result.generator_results, baseline.generator_results
+ )
result_text.append(
"Generator average is {:.2f}% different from the baseline
generator average"
.format(generator_diff))
- receiver_diff = _result_averages_difference(
- result.receiver_results,
- baseline.receiver_results)
+ receiver_diff = result_averages_difference(
+ result.receiver_results, baseline.receiver_results
+ )
result_text.append(
"Receiver average is {:.2f}% different from the baseline
receiver average"
.format(receiver_diff))
@@ -51,7 +52,3 @@ class BaselineFlowAverageEvaluator(BaseEvaluator):
comparison_result = False
recipe.add_result(comparison_result, "\n".join(result_text))
-
-
-def _result_averages_difference(a, b):
- return 100 - ((a.average / b.average)*100)
diff --git a/lnst/RecipeCommon/Perf/Results.py b/lnst/RecipeCommon/Perf/Results.py
index 4591447..e0d80aa 100644
--- a/lnst/RecipeCommon/Perf/Results.py
+++ b/lnst/RecipeCommon/Perf/Results.py
@@ -144,3 +144,8 @@ class ParallelPerfResult(PerfResult, PerfList):
return self[0].unit
else:
return None
+
+def result_averages_difference(a, b):
+ if a is None or b is None:
+ return None
+ return 100 - ((a.average / b.average) * 100)
--
2.21.0
Show replies by date