From be9a782272cbb845ce7ede295d09941af11efd4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 5 May 2020 11:26:35 +0200 Subject: [PATCH] DebugTools: rename function/test to match the use better. --- src/Magnum/DebugTools/FrameProfiler.cpp | 6 +++--- src/Magnum/DebugTools/FrameProfiler.h | 2 +- src/Magnum/DebugTools/Test/FrameProfilerTest.cpp | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Magnum/DebugTools/FrameProfiler.cpp b/src/Magnum/DebugTools/FrameProfiler.cpp index e7b9d7b69..68b8446fa 100644 --- a/src/Magnum/DebugTools/FrameProfiler.cpp +++ b/src/Magnum/DebugTools/FrameProfiler.cpp @@ -277,7 +277,7 @@ bool FrameProfiler::isMeasurementAvailable(const UnsignedInt id) const { return _measuredFrameCount >= Math::max(_measurements[id]._delay, 1u); } -Double FrameProfiler::measurementDataInternal(const Measurement& measurement) const { +Double FrameProfiler::measurementMeanInternal(const Measurement& measurement) const { return Double(measurement._movingSum)/ Math::min(_measuredFrameCount - Math::max(measurement._delay, 1u) + 1, _maxFrameCount); } @@ -287,7 +287,7 @@ Double FrameProfiler::measurementMean(const UnsignedInt id) const { "DebugTools::FrameProfiler::measurementMean(): index" << id << "out of range for" << _measurements.size() << "measurements", {}); CORRADE_ASSERT(_measuredFrameCount >= Math::max(_measurements[id]._delay, 1u), "DebugTools::FrameProfiler::measurementMean(): measurement data available after" << Math::max(_measurements[id]._delay, 1u) - _measuredFrameCount << "more frames", {}); - return measurementDataInternal(_measurements[id]); + return measurementMeanInternal(_measurements[id]); } namespace { @@ -360,7 +360,7 @@ void FrameProfiler::printStatisticsInternal(Debug& out) const { /* Otherwise format the value */ } else { - const Double mean = measurementDataInternal(measurement); + const Double mean = measurementMeanInternal(measurement); switch(measurement._units) { case Units::Nanoseconds: printTime(out, mean); diff --git a/src/Magnum/DebugTools/FrameProfiler.h b/src/Magnum/DebugTools/FrameProfiler.h index ffd932b28..747f3d2f3 100644 --- a/src/Magnum/DebugTools/FrameProfiler.h +++ b/src/Magnum/DebugTools/FrameProfiler.h @@ -380,7 +380,7 @@ class MAGNUM_DEBUGTOOLS_EXPORT FrameProfiler { private: UnsignedInt delayedCurrentData(UnsignedInt delay) const; - Double measurementDataInternal(const Measurement& measurement) const; + Double measurementMeanInternal(const Measurement& measurement) const; void printStatisticsInternal(Debug& out) const; bool _enabled = true; diff --git a/src/Magnum/DebugTools/Test/FrameProfilerTest.cpp b/src/Magnum/DebugTools/Test/FrameProfilerTest.cpp index 89de02939..3bd914c25 100644 --- a/src/Magnum/DebugTools/Test/FrameProfilerTest.cpp +++ b/src/Magnum/DebugTools/Test/FrameProfilerTest.cpp @@ -55,7 +55,7 @@ struct FrameProfilerTest: TestSuite::Tester { void delayTooLittleFrames(); void startStopFrameUnexpected(); void measurementOutOfBounds(); - void dataNotAvailableYet(); + void meanNotAvailableYet(); void statistics(); @@ -127,7 +127,7 @@ FrameProfilerTest::FrameProfilerTest() { &FrameProfilerTest::delayTooLittleFrames, &FrameProfilerTest::startStopFrameUnexpected, &FrameProfilerTest::measurementOutOfBounds, - &FrameProfilerTest::dataNotAvailableYet, + &FrameProfilerTest::meanNotAvailableYet, &FrameProfilerTest::statistics}); @@ -800,7 +800,7 @@ void FrameProfilerTest::measurementOutOfBounds() { "DebugTools::FrameProfiler::measurementMean(): index 2 out of range for 2 measurements\n"); } -void FrameProfilerTest::dataNotAvailableYet() { +void FrameProfilerTest::meanNotAvailableYet() { #ifdef CORRADE_NO_ASSERT CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); #endif