diff options
Diffstat (limited to 'tests/framework')
| -rw-r--r-- | tests/framework/instruments/InstrumentsStats.cpp | 20 | ||||
| -rw-r--r-- | tests/framework/instruments/Measurement.h | 13 |
2 files changed, 18 insertions, 15 deletions
diff --git a/tests/framework/instruments/InstrumentsStats.cpp b/tests/framework/instruments/InstrumentsStats.cpp index 2b05e45aad..6fad8f36ed 100644 --- a/tests/framework/instruments/InstrumentsStats.cpp +++ b/tests/framework/instruments/InstrumentsStats.cpp @@ -22,6 +22,7 @@ * SOFTWARE. */ #include "InstrumentsStats.h" +#include "arm_compute/core/utils/misc/utility.h" namespace arm_compute { @@ -32,25 +33,16 @@ namespace framework InstrumentsStats::InstrumentsStats(const std::vector<Measurement> &measurements) : _min(nullptr), _max(nullptr), _median(nullptr), _mean(measurements.begin()->value().is_floating_point), _stddev(0.0) { - auto cmp_measurements = [](const Measurement & a, const Measurement & b) - { - return a.value() < b.value(); - }; - auto add_measurements = [](Measurement::Value a, const Measurement & b) { return a + b.value(); }; - //Calculate min & max - const auto values = std::minmax_element(measurements.begin(), measurements.end(), cmp_measurements); - _min = &(*values.first); - _max = &(*values.second); - - // Calculate the median value - auto copy = measurements; - std::nth_element(copy.begin(), copy.begin() + (copy.size() / 2), copy.end(), cmp_measurements); - _median = ©[copy.size() / 2]; + //Calculate min, max & median values + auto indices = arm_compute::utility::sort_indices(measurements); + _median = &measurements[indices[measurements.size() / 2]]; + _min = &measurements[indices[0]]; + _max = &measurements[indices[measurements.size() - 1]]; Measurement::Value sum_values = std::accumulate(measurements.begin(), measurements.end(), Measurement::Value(_min->value().is_floating_point), add_measurements); diff --git a/tests/framework/instruments/Measurement.h b/tests/framework/instruments/Measurement.h index 9fb75d7b99..1beacf6cc5 100644 --- a/tests/framework/instruments/Measurement.h +++ b/tests/framework/instruments/Measurement.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -208,6 +208,17 @@ struct Measurement bool is_floating_point; /**< Is the stored value floating point or integer ? */ }; + /** Compare the stored value with another value + * + * @param[in] b Value to compare against + * + * @return The result of stored value < b + */ + bool operator<(const Measurement &b) const + { + return _value < b.value(); + } + /** Stream output operator to print the measurement. * * Prints value and unit. |