From c8ced8597ab28b928862d21554c0a68c238b1165 Mon Sep 17 00:00:00 2001 From: dknn Date: Fri, 17 Aug 2012 16:51:37 +0200 Subject: Move float comparison functions to cpp diff --git a/Swiften/Base/FloatCompare.cpp b/Swiften/Base/FloatCompare.cpp new file mode 100644 index 0000000..ecf11c2 --- /dev/null +++ b/Swiften/Base/FloatCompare.cpp @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2012 Yoann Blein + * Licensed under the simplified BSD license. + * See Documentation/Licenses/BSD-simplified.txt for more information. + */ + +#include + +namespace Swift { + +bool approximatelyEqual(float a, float b, float epsilon) { + return std::fabs(a - b) <= ( (std::fabs(a) < std::fabs(b) ? std::fabs(b) : std::fabs(a)) * epsilon); +} + +bool essentiallyEqual(float a, float b, float epsilon) { + return std::fabs(a - b) <= ( (std::fabs(a) > std::fabs(b) ? std::fabs(b) : std::fabs(a)) * epsilon); +} + +bool definitelyGreaterThan(float a, float b, float epsilon) { + return (a - b) > ( (std::fabs(a) < std::fabs(b) ? std::fabs(b) : std::fabs(a)) * epsilon); +} + +bool definitelyLessThan(float a, float b, float epsilon) { + return (b - a) > ( (std::fabs(a) < std::fabs(b) ? std::fabs(b) : std::fabs(a)) * epsilon); +} + +} + diff --git a/Swiften/Base/FloatCompare.h b/Swiften/Base/FloatCompare.h index 152ffff..bf8f930 100644 --- a/Swiften/Base/FloatCompare.h +++ b/Swiften/Base/FloatCompare.h @@ -6,23 +6,11 @@ #pragma once -#include #include namespace Swift { - bool approximatelyEqual(float a, float b, float epsilon = std::numeric_limits::epsilon()) { - return std::fabs(a - b) <= ( (std::fabs(a) < std::fabs(b) ? std::fabs(b) : std::fabs(a)) * epsilon); - } - - bool essentiallyEqual(float a, float b, float epsilon = std::numeric_limits::epsilon()) { - return std::fabs(a - b) <= ( (std::fabs(a) > std::fabs(b) ? std::fabs(b) : std::fabs(a)) * epsilon); - } - - bool definitelyGreaterThan(float a, float b, float epsilon = std::numeric_limits::epsilon()) { - return (a - b) > ( (std::fabs(a) < std::fabs(b) ? std::fabs(b) : std::fabs(a)) * epsilon); - } - - bool definitelyLessThan(float a, float b, float epsilon = std::numeric_limits::epsilon()) { - return (b - a) > ( (std::fabs(a) < std::fabs(b) ? std::fabs(b) : std::fabs(a)) * epsilon); - } + bool approximatelyEqual(float a, float b, float epsilon = std::numeric_limits::epsilon()); + bool essentiallyEqual(float a, float b, float epsilon = std::numeric_limits::epsilon()); + bool definitelyGreaterThan(float a, float b, float epsilon = std::numeric_limits::epsilon()); + bool definitelyLessThan(float a, float b, float epsilon = std::numeric_limits::epsilon()); } diff --git a/Swiften/Base/SConscript b/Swiften/Base/SConscript index 754164b..fbb61ba 100644 --- a/Swiften/Base/SConscript +++ b/Swiften/Base/SConscript @@ -14,5 +14,6 @@ objects = swiften_env.SwiftenObject([ "BoostRandomGenerator.cpp", "sleep.cpp", "URL.cpp", + "FloatCompare.cpp", ]) swiften_env.Append(SWIFTEN_OBJECTS = [objects]) -- cgit v0.10.2-6-g49f6