From 58f16ccdb5568fe0c539481f570c18d21a53609c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 25 Oct 2015 02:05:58 +0100 Subject: [PATCH] Math: proper fuzzy-compare for std::pair. I should update TestSuite to handle this automagically. --- src/Magnum/Math/Test/FunctionsTest.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Magnum/Math/Test/FunctionsTest.cpp b/src/Magnum/Math/Test/FunctionsTest.cpp index 3fcf635c8..f751e3a86 100644 --- a/src/Magnum/Math/Test/FunctionsTest.cpp +++ b/src/Magnum/Math/Test/FunctionsTest.cpp @@ -453,8 +453,10 @@ void FunctionsTest::trigonometric() { CORRADE_COMPARE(Math::cos(Rad(Constants::pi()/3)), 0.5f); CORRADE_COMPARE_AS(Math::acos(0.5f), Deg(60.0f), Deg); - CORRADE_COMPARE(Math::sincos(Deg(30.0f)), std::make_pair(0.5f, 0.8660254037844386f)); - CORRADE_COMPARE(Math::sincos(Rad(Constants::pi()/6)), std::make_pair(0.5f, 0.8660254037844386f)); + CORRADE_COMPARE(Math::sincos(Deg(30.0f)).first, 0.5f); + CORRADE_COMPARE(Math::sincos(Deg(30.0f)).second, 0.8660254037844386f); + CORRADE_COMPARE(Math::sincos(Rad(Constants::pi()/6)).first, 0.5f); + CORRADE_COMPARE(Math::sincos(Rad(Constants::pi()/6)).second, 0.8660254037844386f); CORRADE_COMPARE(Math::tan(Deg(45.0f)), 1.0f); CORRADE_COMPARE(Math::tan(Rad(Constants::pi()/4)), 1.0f); @@ -472,8 +474,10 @@ void FunctionsTest::trigonometricWithBase() { CORRADE_COMPARE(Math::cos(2*Deg(30.0f)), 0.5f); CORRADE_COMPARE(Math::cos(2*Rad(Constants::pi()/6)), 0.5f); - CORRADE_COMPARE(Math::sincos(2*Deg(15.0f)), std::make_pair(0.5f, 0.8660254037844386f)); - CORRADE_COMPARE(Math::sincos(2*Rad(Constants::pi()/12)), std::make_pair(0.5f, 0.8660254037844386f)); + CORRADE_COMPARE(Math::sincos(2*Deg(15.0f)).first, 0.5f); + CORRADE_COMPARE(Math::sincos(2*Deg(15.0f)).second, 0.8660254037844386f); + CORRADE_COMPARE(Math::sincos(2*Rad(Constants::pi()/12)).first, 0.5f); + CORRADE_COMPARE(Math::sincos(2*Rad(Constants::pi()/12)).second, 0.8660254037844386f); CORRADE_COMPARE(Math::tan(2*Deg(22.5f)), 1.0f); CORRADE_COMPARE(Math::tan(2*Rad(Constants::pi()/8)), 1.0f);