Skip to content

Commit

Permalink
Fix float equal warning and enable more tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@mborland
mborland committed May 10, 2024
1 parent 7584c90 commit 1233bd8
Showing 1 changed file with 100 additions and 34 deletions.
134 changes: 100 additions & 34 deletions test/test_complex.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@
#include <limits>
#include <complex>
#include <iostream>
#include <type_traits>
#include <cmath>

using namespace boost::decimal;

template <typename T>
bool test_equal(T lhs, T rhs, int tol = 10) noexcept
bool test_equal(T lhs, T rhs, int tol = 15) noexcept
{
using std::fabs;
const bool res = fabs(lhs - rhs) < static_cast<T>(tol) * std::numeric_limits<T>::epsilon();
Expand Down Expand Up @@ -51,7 +52,6 @@ void test_construction()
BOOST_TEST(test_equal(v2.imag(), T{2}));
}

/*
template <typename T>
void test_unary_operators()
{
Expand All @@ -61,12 +61,12 @@ void test_unary_operators()

const complex_scalar val {T{2}, T{-2}};
complex_scalar pos_val = +val;
BOOST_TEST_EQ(val.real(), pos_val.real());
BOOST_TEST_EQ(val.imag(), pos_val.imag());
BOOST_TEST(test_equal(val.real(), pos_val.real()));
BOOST_TEST(test_equal(val.imag(), pos_val.imag()));

complex_scalar neg_val = -val;
BOOST_TEST_EQ(neg_val.real(), T{-2});
BOOST_TEST_EQ(neg_val.imag(), T{2});
BOOST_TEST(test_equal(neg_val.real(), T{-2}));
BOOST_TEST(test_equal(neg_val.imag(), T{2}));
}

template <typename T>
Expand All @@ -80,8 +80,8 @@ void test_addition()
complex_scalar rhs_1 {T{2}, T{2}};
complex_scalar res_1 = lhs_1 + rhs_1;

BOOST_TEST_EQ(res_1.real(), T{3});
BOOST_TEST_EQ(res_1.imag(), T{3});
BOOST_TEST(test_equal(res_1.real(), T{3}));
BOOST_TEST(test_equal(res_1.imag(), T{3}));
}

template <typename T>
Expand All @@ -95,8 +95,8 @@ void test_subtraction()
complex_scalar rhs_1 {T{2}, T{2}};
complex_scalar res_1 = lhs_1 - rhs_1;

BOOST_TEST_EQ(res_1.real(), T{-1});
BOOST_TEST_EQ(res_1.imag(), T{-1});
BOOST_TEST(test_equal(res_1.real(), T{-1}));
BOOST_TEST(test_equal(res_1.imag(), T{-1}));
}

template <typename T>
Expand All @@ -110,8 +110,8 @@ void test_multiplication()
complex_scalar rhs_1 {T{2}, T{2}};
complex_scalar res_1 = lhs_1 * rhs_1;

BOOST_TEST_EQ(res_1.real(), T{-12});
BOOST_TEST_EQ(res_1.imag(), T{0});
BOOST_TEST(test_equal(res_1.real(), T{-12}));
BOOST_TEST(test_equal(res_1.imag(), T{0}));
}

template <typename T>
Expand All @@ -125,8 +125,8 @@ void test_division()
complex_scalar rhs_1 {T{2}, T{2}};
complex_scalar res_1 = lhs_1 / rhs_1;

BOOST_TEST_EQ(res_1.real(), T{2});
BOOST_TEST_EQ(res_1.imag(), T{-1});
BOOST_TEST(test_equal(res_1.real(), T{2}));
BOOST_TEST(test_equal(res_1.imag(), T{-1}));
}

template <typename T>
Expand Down Expand Up @@ -162,8 +162,8 @@ void test_non_member_real_imag()

complex_scalar lhs {T{2}, T{-1}};

BOOST_TEST_EQ(real(lhs), lhs.real());
BOOST_TEST_EQ(imag(lhs), lhs.imag());
BOOST_TEST(test_equal(real(lhs), lhs.real()));
BOOST_TEST(test_equal(imag(lhs), lhs.imag()));
}

template <typename T>
Expand All @@ -179,7 +179,7 @@ void test_abs()
BOOST_TEST(test_equal(static_cast<T>(abs(lhs)), static_cast<T>(sqrt(T{2}))));
}

template <typename T>
template <typename T, std::enable_if_t<std::is_floating_point<T>::value, bool> = true>
void test_arg()
{
using std::complex;
Expand All @@ -195,6 +195,21 @@ void test_arg()
BOOST_TEST(test_equal(arg(complex_scalar{T{-1}, T{0}}), pi<T>()));
}

template <typename T, std::enable_if_t<!std::is_floating_point<T>::value, bool> = true>
void test_arg()
{
using std::complex;
using std::polar;
using std::arg;
using complex_scalar = decltype(polar(T(), T()));

BOOST_TEST(test_equal(arg(complex_scalar{T{1}, T{0}}), T{0}));
BOOST_TEST(test_equal(arg(complex_scalar{T{0}, T{0}}), T{0}));
BOOST_TEST(test_equal(arg(complex_scalar{T{0}, T{1}}), numbers::pi_v<T> / 2));
BOOST_TEST(test_equal(arg(complex_scalar{T{-1}, T{0}}), numbers::pi_v<T>));
}


template <typename T>
void test_norm()
{
Expand Down Expand Up @@ -236,13 +251,9 @@ void test_proj()
lhs = complex_scalar{T{std::numeric_limits<T>::infinity()}, T{1}};
complex_scalar rhs = complex_scalar{T{std::numeric_limits<T>::infinity()}, T{0}};
BOOST_TEST_EQ(proj(lhs), rhs);
lhs = complex_scalar{T{std::numeric_limits<T>::infinity()}, T{-1}};
rhs = complex_scalar{T{std::numeric_limits<T>::infinity()}, T{-0}};
BOOST_TEST_EQ(proj(lhs), rhs);
}

template <typename T>
template <typename T, std::enable_if_t<std::is_floating_point<T>::value, bool> = true>
void test_exp()
{
using std::complex;
Expand All @@ -258,7 +269,22 @@ void test_exp()
BOOST_TEST(test_equal(lhs.imag(), rhs.imag()));
}

template <typename T>
template <typename T, std::enable_if_t<!std::is_floating_point<T>::value, bool> = true>
void test_exp()
{
using std::complex;
using std::polar;
using std::exp;
using complex_scalar = decltype(polar(T(), T()));

complex_scalar lhs {T{0}, numbers::pi_v<T>};
lhs = exp(lhs);
complex_scalar rhs {T{-1}, T{0}};
BOOST_TEST(test_equal(lhs.real(), rhs.real()));
BOOST_TEST(test_equal(lhs.imag(), rhs.imag()));
}

template <typename T, std::enable_if_t<std::is_floating_point<T>::value, bool> = true>
void test_log()
{
using std::complex;
Expand Down Expand Up @@ -291,6 +317,41 @@ void test_log()
BOOST_TEST(test_equal(lhs.imag(), rhs.imag()));
}

/*
template <typename T, std::enable_if_t<!std::is_floating_point<T>::value, bool> = true>
void test_log()
{
using std::complex;
using std::polar;
using std::log;
using boost::math::constants::half_pi;
using boost::math::constants::pi;
using complex_scalar = decltype(polar(T(), T()));
complex_scalar lhs {T{0}, T{1}};
lhs = log(lhs);
complex_scalar rhs {T{0}, numbers::pi_v<T> / 2};
BOOST_TEST(test_equal(lhs.real(), rhs.real()));
BOOST_TEST(test_equal(lhs.imag(), rhs.imag()));
lhs = {T{-1}, T{0}};
lhs = log(lhs);
rhs = {T{0}, numbers::pi_v<T>};
BOOST_TEST(test_equal(lhs.real(), rhs.real()));
BOOST_TEST(test_equal(lhs.imag(), rhs.imag()));
// Other side of the cut line
lhs = {T {-1}, -T {0}};
lhs = log(lhs);
rhs = {T {0}, -numbers::pi_v<T>};
BOOST_TEST(test_equal(lhs.real(), rhs.real()));
BOOST_TEST(test_equal(lhs.imag(), rhs.imag()));
}
*/

template <typename T>
void test_scalar_addition()
{
Expand All @@ -302,8 +363,8 @@ void test_scalar_addition()
T rhs_1 {T{2}};
complex_scalar res_1 = lhs_1 + rhs_1;

BOOST_TEST_EQ(res_1.real(), T{3});
BOOST_TEST_EQ(res_1.imag(), T{1});
BOOST_TEST(test_equal(res_1.real(), T{3}));
BOOST_TEST(test_equal(res_1.imag(), T{1}));
}

template <typename T>
Expand All @@ -317,8 +378,8 @@ void test_scalar_subtraction()
T rhs_1 {T{2}};
complex_scalar res_1 = lhs_1 - rhs_1;

BOOST_TEST_EQ(res_1.real(), T{-1});
BOOST_TEST_EQ(res_1.imag(), T{1});
BOOST_TEST(test_equal(res_1.real(), T{-1}));
BOOST_TEST(test_equal(res_1.imag(), T{1}));
}

template <typename T>
Expand All @@ -332,8 +393,8 @@ void test_scalar_multiplication()
T rhs_1 {T{2}};
complex_scalar res_1 = lhs_1 * rhs_1;

BOOST_TEST_EQ(res_1.real(), T{6});
BOOST_TEST_EQ(res_1.imag(), T{4});
BOOST_TEST(test_equal(res_1.real(), T{6}));
BOOST_TEST(test_equal(res_1.imag(), T{4}));
}

template <typename T>
Expand All @@ -347,10 +408,11 @@ void test_scalar_division()
T rhs_1 {T{2}};
complex_scalar res_1 = lhs_1 / rhs_1;

BOOST_TEST_EQ(res_1.real(), T{2});
BOOST_TEST_EQ(res_1.imag(), T{1});
BOOST_TEST(test_equal(res_1.real(), T{2}));
BOOST_TEST(test_equal(res_1.imag(), T{1}));
}

/*
template <typename T>
void test_log10()
{
Expand All @@ -364,7 +426,9 @@ void test_log10()
complex_scalar rhs {T{2}, static_cast<T>(1.36438)};
BOOST_TEST(test_equal(lhs.real(), rhs.real()));
}
*/

/*
template <typename T>
void test_pow()
{
Expand Down Expand Up @@ -395,6 +459,7 @@ void test_pow()
BOOST_TEST(test_equal(lhs.imag(), rhs.imag()));
#endif
}
*/

template <typename T>
void test_sqrt()
Expand Down Expand Up @@ -480,7 +545,6 @@ void test_tanh()
BOOST_TEST(test_equal(lhs.real(), rhs.real()));
BOOST_TEST(test_equal(lhs.imag(), rhs.imag()));
}
*/

int main()
{
Expand All @@ -489,7 +553,6 @@ int main()
test_construction<decimal32>();
test_construction<decimal64>();

/*
test_unary_operators<float>();
test_unary_operators<double>();
test_unary_operators<decimal32>();
Expand Down Expand Up @@ -555,10 +618,12 @@ int main()
test_exp<decimal32>();
test_exp<decimal64>();

/*
test_log<float>();
test_log<double>();
test_log<decimal32>();
test_log<decimal64>();
*/

test_scalar_addition<float>();
test_scalar_addition<double>();
Expand All @@ -580,6 +645,7 @@ int main()
test_scalar_division<decimal32>();
test_scalar_division<decimal64>();

/*
test_log10<float>();
test_log10<double>();
test_log10<decimal32>();
Expand All @@ -589,6 +655,7 @@ int main()
test_pow<double>();
test_pow<decimal32>();
test_pow<decimal64>();
*/

test_sqrt<float>();
test_sqrt<double>();
Expand All @@ -609,7 +676,6 @@ int main()
test_tanh<double>();
test_tanh<decimal32>();
test_tanh<decimal64>();
*/

return boost::report_errors();
}

0 comments on commit 1233bd8

Please sign in to comment.