ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Math: I have no idea what happened here. 

Even after the change I am not sure what I originally meant to do here.
Discovered by PVS-Studio, thanks to @alexesDev for gathering the report.
pull/280/head
Vladimír Vondruš 8 years ago
parent
86b6edb120
commit
87a951fc5d
1 changed files with 9 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      src/Magnum/Math/Test/TypeTraitsTest.cpp

20
src/Magnum/Math/Test/TypeTraitsTest.cpp
Unescape View File

@ -226,12 +226,11 @@ template<class T> void TypeTraitsTest::equalsZeroIntegral() {
setTestCaseName(std::string{"equalsZeroIntegral<"} + TypeTraits<T>::name() + ">"); setTestCaseName(std::string{"equalsZeroIntegral<"} + TypeTraits<T>::name() + ">");
const T a(-123); const T a(-123);
const T b(-123); const T magnitude = abs(a);
const T magnitude = std::max(abs(a), abs(b));
CORRADE_VERIFY(TypeTraits<T>::equals(a, b)); CORRADE_VERIFY(TypeTraits<T>::equals(a, a));
CORRADE_VERIFY(TypeTraits<T>::equalsZero(a - b, magnitude)); CORRADE_VERIFY(TypeTraits<T>::equalsZero(a - a, magnitude));
CORRADE_VERIFY(!TypeTraits<T>::equalsZero(a - b + TypeTraits<T>::epsilon(), magnitude)); CORRADE_VERIFY(!TypeTraits<T>::equalsZero(a - a + TypeTraits<T>::epsilon(), magnitude));
} }
template<class T> void TypeTraitsTest::equalsZeroFloatingPoint() { template<class T> void TypeTraitsTest::equalsZeroFloatingPoint() {
@ -239,15 +238,14 @@ template<class T> void TypeTraitsTest::equalsZeroFloatingPoint() {
setTestCaseDescription(EqualsZeroData[testCaseInstanceId()].name); setTestCaseDescription(EqualsZeroData[testCaseInstanceId()].name);
const T a = EqualsZeroData[testCaseInstanceId()].get(T{}); const T a = EqualsZeroData[testCaseInstanceId()].get(T{});
const T b = EqualsZeroData[testCaseInstanceId()].get(T{});
const T step = EqualsZeroData[testCaseInstanceId()].getStep(T{}); const T step = EqualsZeroData[testCaseInstanceId()].getStep(T{});
const T magnitude = std::max(abs(a), abs(b)); const T magnitude = abs(a);
CORRADE_VERIFY(TypeTraits<T>::equals(a + step/T(2.0), b)); CORRADE_VERIFY(TypeTraits<T>::equals(a + step/T(2.0), a));
CORRADE_VERIFY(TypeTraits<T>::equalsZero(a + step/T(2.0) - b, magnitude)); CORRADE_VERIFY(TypeTraits<T>::equalsZero(a + step/T(2.0) - a, magnitude));
CORRADE_VERIFY(!TypeTraits<T>::equals(a - step*T(2.0), b)); CORRADE_VERIFY(!TypeTraits<T>::equals(a - step*T(2.0), a));
CORRADE_VERIFY(!TypeTraits<T>::equalsZero(a - step*T(2.0) - b, magnitude)); CORRADE_VERIFY(!TypeTraits<T>::equalsZero(a - step*T(2.0) - a, magnitude));
} }
}}} }}}

Write Preview
Loading…
Cancel
Save