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

regenerated to include Approx changes

This commit is contained in:
Phil Nash 2011-06-07 14:13:57 +01:00
parent 2fa72a47cd
commit f721a96d24
1 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
single_include/catch.hpp
View File

@ -2377,14 +2377,44 @@ namespace Catch
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
explicit Approx explicit Approx
( (
double d double value
) )
: m_epsilon( std::numeric_limits<double>::epsilon() ), : m_epsilon( std::numeric_limits<float>::epsilon()*100 ),
m_scale( 1.0 ), m_scale( 1.0 ),
m_d( d ) m_value( value )
{ {
} }
///////////////////////////////////////////////////////////////////////////
Approx
(
const Approx& other
)
: m_epsilon( other.m_epsilon ),
m_scale( other.m_scale ),
m_value( other.m_value )
{
}
///////////////////////////////////////////////////////////////////////////
static Approx custom
()
{
return Approx( 0 );
}
///////////////////////////////////////////////////////////////////////////
Approx operator()
(
double value
)
{
Approx approx( value );
approx.epsilon( m_epsilon );
approx.scale( m_scale );
return approx;
}
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
friend bool operator == friend bool operator ==
( (
@ -2393,7 +2423,7 @@ namespace Catch
) )
{ {
// Thanks to Richard Harris for his help refining this formula // Thanks to Richard Harris for his help refining this formula
return fabs( lhs - rhs.m_d ) < rhs.m_epsilon * (rhs.m_scale + (std::max)( fabs(lhs), fabs(rhs.m_d) ) ); return fabs( lhs - rhs.m_value ) < rhs.m_epsilon * (rhs.m_scale + (std::max)( fabs(lhs), fabs(rhs.m_value) ) );
} }
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
@ -2451,14 +2481,14 @@ namespace Catch
std::string toString() const std::string toString() const
{ {
std::ostringstream oss; std::ostringstream oss;
oss << "Approx( " << m_d << ")"; oss << "Approx( " << m_value << ")";
return oss.str(); return oss.str();
} }
private: private:
double m_epsilon; double m_epsilon;
double m_scale; double m_scale;
double m_d; double m_value;
}; };
} }
@ -4578,7 +4608,7 @@ namespace Catch
*/ */
#define TWOBLUECUBES_CATCH_REPORTER_BASIC_HPP_INCLUDED #define TWOBLUECUBES_CATCH_REPORTER_BASIC_HPP_INCLUDED
// #included from: internal/catch_reporter_registrars.hpp // #included from: ../internal/catch_reporter_registrars.hpp
/* /*
* catch_reporter_registrars.hpp * catch_reporter_registrars.hpp
@ -4979,7 +5009,7 @@ namespace Catch
*/ */
#define TWOBLUECUBES_CATCH_REPORTER_XML_HPP_INCLUDED #define TWOBLUECUBES_CATCH_REPORTER_XML_HPP_INCLUDED
// #included from: internal/catch_xmlwriter.hpp // #included from: ../internal/catch_xmlwriter.hpp
/* /*
* catch_xmlwriter.hpp * catch_xmlwriter.hpp