mpusz/mp-units
1
0
Fork 1
mirror of https://github.com/mpusz/mp-units.git synced 2025-08-03 12:24:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

increase tolerance for certain math tests to two epsilon

Browse Source
This commit is contained in:
Yves Delley
2024-09-16 20:34:12 +02:00
parent add0a817e2
commit 3e502fb795
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/runtime/almost_equals.h
View File

@@ -35,7 +35,7 @@ namespace mp_units {
template<Quantity T> template<Quantity T>
struct AlmostEqualsMatcher : Catch::Matchers::MatcherGenericBase { struct AlmostEqualsMatcher : Catch::Matchers::MatcherGenericBase {
explicit AlmostEqualsMatcher(const T& target) : target_{target} {} explicit AlmostEqualsMatcher(const T& target, int n_eps) : target_{target}, n_eps_{n_eps} {}
template<std::convertible_to<T> U> template<std::convertible_to<T> U>
requires std::same_as<typename T::rep, typename U::rep> requires std::same_as<typename T::rep, typename U::rep>
@@ -48,7 +48,7 @@ struct AlmostEqualsMatcher : Catch::Matchers::MatcherGenericBase {
const auto y = common(other).numerical_value_in(common::unit); const auto y = common(other).numerical_value_in(common::unit);
if constexpr (treat_as_floating_point<rep>) { if constexpr (treat_as_floating_point<rep>) {
const auto maxXYOne = std::max({rep{1}, abs(x), abs(y)}); const auto maxXYOne = std::max({rep{1}, abs(x), abs(y)});
return abs(x - y) <= std::numeric_limits<rep>::epsilon() * maxXYOne; return abs(x - y) <= (n_eps_ * std::numeric_limits<rep>::epsilon()) * maxXYOne;
} else { } else {
if (x >= 0) { if (x >= 0) {
return x - 1 <= y && y - 1 <= x; return x - 1 <= y && y - 1 <= x;
@@ -71,12 +71,13 @@ struct AlmostEqualsMatcher : Catch::Matchers::MatcherGenericBase {
private: private:
const T& target_; const T& target_;
int n_eps_;
}; };
template<Quantity T> template<Quantity T>
AlmostEqualsMatcher<T> AlmostEquals(const T& target) AlmostEqualsMatcher<T> AlmostEquals(const T& target, int n_eps = 1)
{ {
return AlmostEqualsMatcher<T>{target}; return AlmostEqualsMatcher<T>{target, n_eps};
} }

4
test/runtime/math_test.cpp
View File

@@ -448,7 +448,7 @@ TEST_CASE("Angle trigonometric functions", "[trig][angle]")
REQUIRE_THAT(sin(0 * angle[grad]), AlmostEquals(0. * one)); REQUIRE_THAT(sin(0 * angle[grad]), AlmostEquals(0. * one));
REQUIRE_THAT(sin(100 * angle[grad]), AlmostEquals(1. * one)); REQUIRE_THAT(sin(100 * angle[grad]), AlmostEquals(1. * one));
REQUIRE_THAT(sin(200 * angle[grad]), AlmostEquals(0. * one)); REQUIRE_THAT(sin(200 * angle[grad]), AlmostEquals(0. * one, 2));
REQUIRE_THAT(sin(300 * angle[grad]), AlmostEquals(-1. * one)); REQUIRE_THAT(sin(300 * angle[grad]), AlmostEquals(-1. * one));
} }
@@ -475,7 +475,7 @@ TEST_CASE("Angle trigonometric functions", "[trig][angle]")
REQUIRE_THAT(tan(0 * angle[grad]), AlmostEquals(0. * one)); REQUIRE_THAT(tan(0 * angle[grad]), AlmostEquals(0. * one));
REQUIRE_THAT(tan(50 * angle[grad]), AlmostEquals(1. * one)); REQUIRE_THAT(tan(50 * angle[grad]), AlmostEquals(1. * one));
REQUIRE_THAT(tan(150 * angle[grad]), AlmostEquals(-1. * one)); REQUIRE_THAT(tan(150 * angle[grad]), AlmostEquals(-1. * one));
REQUIRE_THAT(tan(200 * angle[grad]), AlmostEquals(0. * one)); REQUIRE_THAT(tan(200 * angle[grad]), AlmostEquals(0. * one, 2));
} }
} }