diff --git a/tests/test_mxp_truncated_mantissa_t.cxx b/tests/test_mxp_truncated_mantissa_t.cxx index 900ef41b..53007499 100644 --- a/tests/test_mxp_truncated_mantissa_t.cxx +++ b/tests/test_mxp_truncated_mantissa_t.cxx @@ -12,17 +12,6 @@ #include "test_mxp_helper.h" -template -void generic_truncated_add(const gt::gtensor& x, - gt::gtensor& y) -{ - using mxp_type = mxp::truncated_mantissa_t; - const auto mxp_x = mxp::adapt<1, S, mxp_type>(x.data(), x.size()); - auto mxp_y = mxp::adapt<1, S, mxp_type>(y.data(), y.size()); - - mxp_y = mxp_y + mxp_x; -} - template float ref_truncated_add_float() { @@ -81,7 +70,12 @@ struct run_test_add_host auto gt_y = gt::adapt<1, S>(y.data(), y.size()); y.view() = y_init; - generic_truncated_add(x, y); + using mxp_type = mxp::truncated_mantissa_t; + const auto mxp_x = mxp::adapt<1, S, mxp_type>(x.data(), x.size()); + auto mxp_y = mxp::adapt<1, S, mxp_type>(y.data(), y.size()); + + mxp_y = mxp_y + mxp_x; + EXPECT_EQ( y, (gt::gtensor(y.size(), ref_truncated_add_gen()))); } @@ -151,20 +145,6 @@ TEST(mxp_truncated_mantissa, add_complex_double) Loop<0, 52, run_test_add_host>::Run(x, y, y_init); } -template -void generic_view_truncated_add(const gt::gtensor& x, - gt::gtensor& y) -{ - using mxp_type = mxp::truncated_mantissa_t; - const auto mxp_x = mxp::adapt<1, S, mxp_type>(x.data(), x.size()); - auto mxp_y = mxp::adapt<1, S, mxp_type>(y.data(), y.size()); - - using gt::placeholders::_all; - using gt::placeholders::_s; - - mxp_y.view(_s(1, -1)) = mxp_y.view(_s(1, -1)) + mxp_x.view(_all); -} - struct run_test_view_add_host { using S = gt::space::host; @@ -176,7 +156,14 @@ struct run_test_view_add_host auto gt_y = gt::adapt<1, S>(y.data(), y.size()); y.view() = y_init; - generic_view_truncated_add(x, y); + using mxp_type = mxp::truncated_mantissa_t; + const auto mxp_x = mxp::adapt<1, S, mxp_type>(x.data(), x.size()); + auto mxp_y = mxp::adapt<1, S, mxp_type>(y.data(), y.size()); + + using gt::placeholders::_all; + using gt::placeholders::_s; + + mxp_y.view(_s(1, -1)) = mxp_y.view(_s(1, -1)) + mxp_x.view(_all); EXPECT_EQ(y, (gt::gtensor{y_init, ref_truncated_add_gen(), ref_truncated_add_gen(), @@ -255,20 +242,6 @@ TEST(mxp_truncated_mantissa, view_add_complex_double) Loop<0, 52, run_test_view_add_host>::Run(x, y, y_init); } -template -void generic_view_2D_truncated_add(const gt::gtensor& x, - gt::gtensor& y) -{ - using mxp_type = mxp::truncated_mantissa_t; - const auto mxp_x = mxp::adapt<1, S, mxp_type>(x.data(), x.size()); - auto mxp_y = mxp::adapt<2, S, mxp_type>(y.data(), y.shape()); - - using gt::placeholders::_all; - using gt::placeholders::_s; - - mxp_y.view(_s(1, -1), 1) = mxp_y.view(_s(1, -1), 1) + mxp_x.view(_all); -} - struct run_test_view_2D_add_host { using S = gt::space::host; @@ -280,7 +253,14 @@ struct run_test_view_2D_add_host auto gt_y = gt::adapt<2, S>(y.data(), y.shape()); y.view() = y_init; - generic_view_2D_truncated_add(x, y); + using mxp_type = mxp::truncated_mantissa_t; + const auto mxp_x = mxp::adapt<1, S, mxp_type>(x.data(), x.size()); + auto mxp_y = mxp::adapt<2, S, mxp_type>(y.data(), y.shape()); + + using gt::placeholders::_all; + using gt::placeholders::_s; + + mxp_y.view(_s(1, -1), 1) = mxp_y.view(_s(1, -1), 1) + mxp_x.view(_all); EXPECT_EQ( y, (gt::gtensor{{y_init, y_init, y_init, y_init, y_init}, {y_init, ref_truncated_add_gen(), @@ -370,7 +350,7 @@ struct run_test_error_bounds_host using mxp_type = mxp::truncated_mantissa_t; const auto mxp_x = mxp::adapt<1, S, mxp_type>(x.data(), x.size()); const auto gt_x = gt::adapt<1, S>(x.data(), x.size()); - /* */ auto gt_y = gt::adapt<1, S>(y.data(), y.size()); + auto gt_y = gt::adapt<1, S>(y.data(), y.size()); gt_y = gt_x - mxp_x;