3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated to use Richard Harris' approximation formula

This commit is contained in:
Phil Nash 2011-04-28 08:11:00 +01:00
parent d7c203c3e9
commit d7b8b01f3e
1 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
include/internal/catch_approx.hpp
View File

@ -18,27 +18,19 @@
namespace Catch namespace Catch
{ {
// !TBD Need to clean this all up
#define CATCH_absTol 1e-10
#define CATCH_relTol 1e-10
inline double catch_max( double x, double y )
{
return x > y ? x : y;
}
namespace Detail namespace Detail
{ {
class Approx class Approx
{ {
public: public:
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// !TBD more generic
explicit Approx explicit Approx
( (
double d double d
) )
: m_d( d ) : m_epsilon( 1e-10 ),
m_scale( 1.0 ),
m_d( d )
{ {
} }
@ -46,27 +38,27 @@ namespace Catch
template<typename T> template<typename T>
friend bool operator == friend bool operator ==
( (
const T& lhs, const T& lhs,
const Approx& rhs const Approx& rhs
) )
{ {
// !TBD Use proper tolerance // Thanks to Richard Harris for his help refining this formula
// From: http://realtimecollisiondetection.net/blog/?p=89 return fabs( lhs - rhs.m_d ) < rhs.m_epsilon * (rhs.m_scale + (std::max)( fabs(lhs), fabs(rhs.m_d) ) );
// see also: http://www.cygnus-software.com/papers/comparingfloats/comparingfloats.htm
return fabs( lhs - rhs.m_d ) <= catch_max( CATCH_absTol, CATCH_relTol * catch_max( fabs(lhs), fabs(rhs.m_d) ) );
} }
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
template<typename T> template<typename T>
friend bool operator != friend bool operator !=
( (
const T& lhs, const T& lhs,
const Approx& rhs const Approx& rhs
) )
{ {
return ! operator==( lhs, rhs ); return !operator==( lhs, rhs );
} }
double m_epsilon;
double m_scale;
double m_d; double m_d;
}; };
} }