From af4dca452a95a5b43ac0395f9505ade583aacf2f Mon Sep 17 00:00:00 2001 From: Tim Redfern Date: Tue, 14 May 2013 12:15:14 +0100 Subject: comparison and arithmetic --- rotord/utils.cpp | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'rotord/utils.cpp') diff --git a/rotord/utils.cpp b/rotord/utils.cpp index 9e8beb6..9828124 100644 --- a/rotord/utils.cpp +++ b/rotord/utils.cpp @@ -4,21 +4,26 @@ using namespace std; //float equality bool fequal(const float u,const float v){ - if (abs(u-v)<.001) return true; + if (abs(u-v)-.001) return true; + if (u-v>-FLOAT_THRESHOLD) return true; else return false; }; -bool fmoreorequal(const float u,const float v){ +bool fgreater_or_equal(const float u,const float v){ //v is more or equal to u - if (v-u>-.001) return true; + if (v-u>-FLOAT_THRESHOLD) return true; else return false; }; bool fless(const float u,const float v){ - //v is less or equal to u - if (u-v>.001) return true; + //v is less than u + if (u-v>FLOAT_THRESHOLD) return true; + else return false; +}; +bool fgreater(const float u,const float v){ + //v is greater than u + if (v-u>FLOAT_THRESHOLD) return true; else return false; }; -- cgit v1.2.3