diff options
Diffstat (limited to 'tests/framework/printers')
| -rw-r--r-- | tests/framework/printers/JSONPrinter.cpp | 9 | ||||
| -rw-r--r-- | tests/framework/printers/PrettyPrinter.cpp | 9 |
2 files changed, 10 insertions, 8 deletions
diff --git a/tests/framework/printers/JSONPrinter.cpp b/tests/framework/printers/JSONPrinter.cpp index bf8fce7844..ae19cae67c 100644 --- a/tests/framework/printers/JSONPrinter.cpp +++ b/tests/framework/printers/JSONPrinter.cpp @@ -23,7 +23,8 @@ */ #include "JSONPrinter.h" -#include "tests/framework/Framework.h" +#include "../Framework.h" +#include "../instruments/Measurement.h" #include <algorithm> @@ -133,12 +134,12 @@ void JSONPrinter::print_measurements(const Profiler::MeasurementsMap &measuremen { *_stream << R"(")" << i_it->first << R"(" : {)"; - auto add_measurements = [](double a, const Instrument::Measurement & b) + auto add_measurements = [](double a, const Measurement & b) { return a + b.value; }; - auto cmp_measurements = [](const Instrument::Measurement & a, const Instrument::Measurement & b) + auto cmp_measurements = [](const Measurement & a, const Measurement & b) { return a.value < b.value; }; @@ -153,7 +154,7 @@ void JSONPrinter::print_measurements(const Profiler::MeasurementsMap &measuremen num_values -= 2; } - auto measurement_to_string = [](const Instrument::Measurement & measurement) + auto measurement_to_string = [](const Measurement & measurement) { return support::cpp11::to_string(measurement.value); }; diff --git a/tests/framework/printers/PrettyPrinter.cpp b/tests/framework/printers/PrettyPrinter.cpp index b0892a4a50..2f7df1837a 100644 --- a/tests/framework/printers/PrettyPrinter.cpp +++ b/tests/framework/printers/PrettyPrinter.cpp @@ -23,7 +23,8 @@ */ #include "PrettyPrinter.h" -#include "tests/framework/Framework.h" +#include "../Framework.h" +#include "../instruments/Measurement.h" #include <algorithm> @@ -112,12 +113,12 @@ void PrettyPrinter::print_measurements(const Profiler::MeasurementsMap &measurem { *_stream << begin_color("3") << " " << instrument.first << ":"; - auto add_measurements = [](double a, const Instrument::Measurement & b) + auto add_measurements = [](double a, const Measurement & b) { return a + b.value; }; - auto cmp_measurements = [](const Instrument::Measurement & a, const Instrument::Measurement & b) + auto cmp_measurements = [](const Measurement & a, const Measurement & b) { return a.value < b.value; }; @@ -132,7 +133,7 @@ void PrettyPrinter::print_measurements(const Profiler::MeasurementsMap &measurem num_values -= 2; } - Instrument::Measurement avg{ sum_values / num_values, minmax_values.first->unit }; + Measurement avg{ sum_values / num_values, minmax_values.first->unit }; *_stream << " "; *_stream << "AVG=" << avg << ", "; |