BlackMATov/vmath.hpp
1
0
Fork 0
mirror of https://github.com/BlackMATov/vmath.hpp.git synced 2025-12-16 22:19:51 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix tests

Browse Source
This commit is contained in:
BlackMATov
2020-11-26 02:39:04 +07:00
parent bd156d8af9
commit 87e4233383
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
untests/vmath_tests.hpp
View File

@@ -22,8 +22,7 @@ namespace vmath_tests
explicit constexpr approx(T v) : value(v) {} explicit constexpr approx(T v) : value(v) {}
friend constexpr bool operator==(const T& l, const approx& r) { friend constexpr bool operator==(const T& l, const approx& r) {
return (r.value < l + epsilon<T>) return equal_to(l, r.value, epsilon<T>);
&& (l < r.value + epsilon<T>);
} }
}; };
@@ -35,8 +34,7 @@ namespace vmath_tests
constexpr explicit approx2(const vec<T, 2>& v) : value(v) {} constexpr explicit approx2(const vec<T, 2>& v) : value(v) {}
friend constexpr bool operator==(const vec<T, 2>& l, const approx2& r) { friend constexpr bool operator==(const vec<T, 2>& l, const approx2& r) {
return l[0] == approx(r.value[0]) return all(equal_to(l, r.value, epsilon<T>));
&& l[1] == approx(r.value[1]);
} }
}; };
@@ -48,9 +46,7 @@ namespace vmath_tests
constexpr explicit approx3(const vec<T, 3>& v) : value(v) {} constexpr explicit approx3(const vec<T, 3>& v) : value(v) {}
friend constexpr bool operator==(const vec<T, 3>& l, const approx3& r) { friend constexpr bool operator==(const vec<T, 3>& l, const approx3& r) {
return l[0] == approx(r.value[0]) return all(equal_to(l, r.value, epsilon<T>));
&& l[1] == approx(r.value[1])
&& l[2] == approx(r.value[2]);
} }
}; };
@@ -62,10 +58,7 @@ namespace vmath_tests
constexpr explicit approx4(const vec<T, 4>& v) : value(v) {} constexpr explicit approx4(const vec<T, 4>& v) : value(v) {}
friend constexpr bool operator==(const vec<T, 4>& l, const approx4& r) { friend constexpr bool operator==(const vec<T, 4>& l, const approx4& r) {
return l[0] == approx(r.value[0]) return all(equal_to(l, r.value, epsilon<T>));
&& l[1] == approx(r.value[1])
&& l[2] == approx(r.value[2])
&& l[3] == approx(r.value[3]);
} }
}; };

2
untests/vmath_vec_fun_tests.cpp
View File

@@ -145,7 +145,7 @@ TEST_CASE("vmath/vec_fun") {
REQUIRE_FALSE(isinf(float2(1.f)).x); REQUIRE_FALSE(isinf(float2(1.f)).x);
REQUIRE(isfinite(float2(1.f)).x); REQUIRE(isfinite(float2(1.f)).x);
REQUIRE(isnormal(float2(1.f)).x); REQUIRE(isnormal(float2(1.f)).x);
REQUIRE(issubnormal(float2(1.f)).x); REQUIRE_FALSE(issubnormal(float2(1.f)).x);
REQUIRE_FALSE(fma(float2(2.f), float2(3.f), float2(4.f)).x == Approx(12.f)); REQUIRE_FALSE(fma(float2(2.f), float2(3.f), float2(4.f)).x == Approx(12.f));