From 9eb8e2afba2ce71d4505ab1ad34071485ef3e86d Mon Sep 17 00:00:00 2001 From: Charles Schlosser Date: Fri, 5 May 2023 03:08:43 +0000 Subject: [PATCH] Change array_cwise test name --- test/array_cwise.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/test/array_cwise.cpp b/test/array_cwise.cpp index 5635ca8ab..760112569 100644 --- a/test/array_cwise.cpp +++ b/test/array_cwise.cpp @@ -289,7 +289,7 @@ void test_exponent(Exponent exponent) { const Index array_size = 2 * internal::packet_traits::size + 1; Base max_base = numext::mini(testing_threshold, max_abs_bases); - Base min_base = NumTraits::IsSigned ? -max_base : Base(0); + Base min_base = negative_or_zero(max_base); ArrayX x(array_size), y(array_size); bool all_pass = true; @@ -419,7 +419,7 @@ void signbit_tests() { signbit_test(); } -template void array(const ArrayType& m) +template void array_generic(const ArrayType& m) { typedef typename ArrayType::Scalar Scalar; typedef typename ArrayType::RealScalar RealScalar; @@ -815,7 +815,7 @@ template void array_real(const ArrayType& m) ArrayType tmp = m1.atan2(m2); for (Index i = 0; i < tmp.size(); ++i) { Scalar actual = tmp.array()(i); - Scalar expected = atan2(m1.array()(i), m2.array()(i)); + Scalar expected = Scalar(std::atan2(m1.array()(i), m2.array()(i))); VERIFY_IS_APPROX(actual, expected); } @@ -1183,17 +1183,17 @@ void typed_logicals_test(const ArrayType& m) { EIGEN_DECLARE_TEST(array_cwise) { for(int i = 0; i < g_repeat; i++) { - CALL_SUBTEST_1( array(Array()) ); - CALL_SUBTEST_2( array(Array22f()) ); - CALL_SUBTEST_3( array(Array44d()) ); - CALL_SUBTEST_4( array(ArrayXXcf(internal::random(1,EIGEN_TEST_MAX_SIZE), internal::random(1,EIGEN_TEST_MAX_SIZE))) ); - CALL_SUBTEST_5( array(ArrayXXf(internal::random(1,EIGEN_TEST_MAX_SIZE), internal::random(1,EIGEN_TEST_MAX_SIZE))) ); - CALL_SUBTEST_6( array(ArrayXXi(internal::random(1,EIGEN_TEST_MAX_SIZE), internal::random(1,EIGEN_TEST_MAX_SIZE))) ); - CALL_SUBTEST_6( array(Array(internal::random(1,EIGEN_TEST_MAX_SIZE), internal::random(1,EIGEN_TEST_MAX_SIZE))) ); + CALL_SUBTEST_1( array_generic(Array()) ); + CALL_SUBTEST_2( array_generic(Array22f()) ); + CALL_SUBTEST_3( array_generic(Array44d()) ); + CALL_SUBTEST_4( array_generic(ArrayXXcf(internal::random(1,EIGEN_TEST_MAX_SIZE), internal::random(1,EIGEN_TEST_MAX_SIZE))) ); + CALL_SUBTEST_5( array_generic(ArrayXXf(internal::random(1,EIGEN_TEST_MAX_SIZE), internal::random(1,EIGEN_TEST_MAX_SIZE))) ); + CALL_SUBTEST_6( array_generic(ArrayXXi(internal::random(1,EIGEN_TEST_MAX_SIZE), internal::random(1,EIGEN_TEST_MAX_SIZE))) ); + CALL_SUBTEST_6( array_generic(Array(internal::random(1,EIGEN_TEST_MAX_SIZE), internal::random(1,EIGEN_TEST_MAX_SIZE))) ); CALL_SUBTEST_7( signed_shift_test(ArrayXXi(internal::random(1, EIGEN_TEST_MAX_SIZE), internal::random(1, EIGEN_TEST_MAX_SIZE)))); CALL_SUBTEST_7( signed_shift_test(Array(internal::random(1, EIGEN_TEST_MAX_SIZE), internal::random(1, EIGEN_TEST_MAX_SIZE)))); - CALL_SUBTEST_8( array(Array(internal::random(1, EIGEN_TEST_MAX_SIZE), internal::random(1, EIGEN_TEST_MAX_SIZE)))); - CALL_SUBTEST_8( array(Array(internal::random(1, EIGEN_TEST_MAX_SIZE), internal::random(1, EIGEN_TEST_MAX_SIZE)))); + CALL_SUBTEST_8( array_generic(Array(internal::random(1, EIGEN_TEST_MAX_SIZE), internal::random(1, EIGEN_TEST_MAX_SIZE)))); + CALL_SUBTEST_8( array_generic(Array(internal::random(1, EIGEN_TEST_MAX_SIZE), internal::random(1, EIGEN_TEST_MAX_SIZE)))); } for(int i = 0; i < g_repeat; i++) { CALL_SUBTEST_1( comparisons(Array()) );