From 2c461095d97f45e8c2618a2f761895302ae62cd1 Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Sat, 30 Dec 2023 22:28:11 +0100 Subject: [PATCH] refactor: Use existing CMathUtils function --- src/blackmisc/aviation/aircraftsituation.h | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/blackmisc/aviation/aircraftsituation.h b/src/blackmisc/aviation/aircraftsituation.h index 462380890..64f8fab75 100644 --- a/src/blackmisc/aviation/aircraftsituation.h +++ b/src/blackmisc/aviation/aircraftsituation.h @@ -20,6 +20,7 @@ #include "blackmisc/pq/length.h" #include "blackmisc/pq/speed.h" #include "blackmisc/pq/time.h" +#include "blackmisc/math/mathutils.h" #include "blackmisc/propertyindexref.h" #include "blackmisc/timestampbased.h" #include "blackmisc/valueobject.h" @@ -529,25 +530,29 @@ namespace BlackMisc //! Both on ground static bool isGfEqualOnGround(double oldGroundFactor, double newGroundFactor) { - return isDoubleEpsilonEqual(1.0, oldGroundFactor) && isDoubleEpsilonEqual(1.0, newGroundFactor); + using namespace BlackMisc::Math; + return CMathUtils::epsilonEqualLimits(1.0, oldGroundFactor) && CMathUtils::epsilonEqualLimits(1.0, newGroundFactor); } //! Both not on ground static bool isGfEqualAirborne(double oldGroundFactor, double newGroundFactor) { - return isDoubleEpsilonEqual(0.0, oldGroundFactor) && isDoubleEpsilonEqual(0.0, newGroundFactor); + using namespace BlackMisc::Math; + return CMathUtils::epsilonEqualLimits(0.0, oldGroundFactor) && CMathUtils::epsilonEqualLimits(0.0, newGroundFactor); } //! Aircraft is starting static bool isGfStarting(double oldGroundFactor, double newGroundFactor) { - return isDoubleEpsilonEqual(0.0, oldGroundFactor) && isDoubleEpsilonEqual(1.0, newGroundFactor); + using namespace BlackMisc::Math; + return CMathUtils::epsilonEqualLimits(0.0, oldGroundFactor) && CMathUtils::epsilonEqualLimits(1.0, newGroundFactor); } //! Aircraft is landing static bool isGfLanding(double oldGroundFactor, double newGroundFactor) { - return isDoubleEpsilonEqual(1.0, oldGroundFactor) && isDoubleEpsilonEqual(0.0, newGroundFactor); + using namespace BlackMisc::Math; + return CMathUtils::epsilonEqualLimits(1.0, oldGroundFactor) && CMathUtils::epsilonEqualLimits(0.0, newGroundFactor); } //! @} @@ -588,12 +593,6 @@ namespace BlackMisc double m_onGroundFactor = -1; //!< interpolated ground flag, 1..on ground, 0..not on ground, -1 no info QString m_onGroundGuessingDetails; //!< only for debugging, not transferred via DBus etc. - //! Equal double values? - static bool isDoubleEpsilonEqual(double d1, double d2) - { - return qAbs(d1 - d2) <= std::numeric_limits::epsilon(); - } - BLACK_METACLASS( CAircraftSituation, BLACK_METAMEMBER(correspondingCallsign),