commit 40df1e9b770393a77afc2ebb94ff7e8f6f8696ed
author Michalis Spyrou <michalis.spyrou@arm.com> Tue Feb 06 16:53:47 2018 +0000
committer Anthony Barbier <anthony.barbier@arm.com> Fri Nov 02 16:46:07 2018 +0000
tree ef492bb1cd0a14e7cf3315da01e62b2973828b8d
parent f75ab3fb8a1a2a617499c41f8d06e63174165012

COMPMID-887 Valgrind invalid read in print_measurements

Change-Id: I595d9ac7a616b3ab21ccc889251d0895c9ac9fb0
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/119099
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>

tests/framework/instruments/InstrumentsStats.cpp

diff --git a/tests/framework/instruments/InstrumentsStats.cpp b/tests/framework/instruments/InstrumentsStats.cpp
index 2b05e45..6fad8f3 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 @@
 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[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);