From 2d0dfe5d60befb92264a22c7ab21593e953ae7d8 Mon Sep 17 00:00:00 2001 From: Hauke Heibel Date: Thu, 16 Dec 2010 17:36:10 +0100 Subject: [PATCH] Uups - re-enabled subtests 1 to 5. --- test/array.cpp | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/test/array.cpp b/test/array.cpp index fc6334610..8d73e1494 100644 --- a/test/array.cpp +++ b/test/array.cpp @@ -204,32 +204,32 @@ template void array_real(const ArrayType& m) void test_array() { 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(3, 3)) ); - //CALL_SUBTEST_5( array(ArrayXXf(8, 12)) ); + CALL_SUBTEST_1( array(Array()) ); + CALL_SUBTEST_2( array(Array22f()) ); + CALL_SUBTEST_3( array(Array44d()) ); + CALL_SUBTEST_4( array(ArrayXXcf(3, 3)) ); + CALL_SUBTEST_5( array(ArrayXXf(8, 12)) ); CALL_SUBTEST_6( array(ArrayXXi(8, 12)) ); } - //for(int i = 0; i < g_repeat; i++) { - // CALL_SUBTEST_1( comparisons(Array()) ); - // CALL_SUBTEST_2( comparisons(Array22f()) ); - // CALL_SUBTEST_3( comparisons(Array44d()) ); - // CALL_SUBTEST_5( comparisons(ArrayXXf(8, 12)) ); - // CALL_SUBTEST_6( comparisons(ArrayXXi(8, 12)) ); - //} - //for(int i = 0; i < g_repeat; i++) { - // CALL_SUBTEST_1( array_real(Array()) ); - // CALL_SUBTEST_2( array_real(Array22f()) ); - // CALL_SUBTEST_3( array_real(Array44d()) ); - // CALL_SUBTEST_5( array_real(ArrayXXf(8, 12)) ); - //} + for(int i = 0; i < g_repeat; i++) { + CALL_SUBTEST_1( comparisons(Array()) ); + CALL_SUBTEST_2( comparisons(Array22f()) ); + CALL_SUBTEST_3( comparisons(Array44d()) ); + CALL_SUBTEST_5( comparisons(ArrayXXf(8, 12)) ); + CALL_SUBTEST_6( comparisons(ArrayXXi(8, 12)) ); + } + for(int i = 0; i < g_repeat; i++) { + CALL_SUBTEST_1( array_real(Array()) ); + CALL_SUBTEST_2( array_real(Array22f()) ); + CALL_SUBTEST_3( array_real(Array44d()) ); + CALL_SUBTEST_5( array_real(ArrayXXf(8, 12)) ); + } - //VERIFY((internal::is_same< internal::global_math_functions_filtering_base::type, int >::value)); - //VERIFY((internal::is_same< internal::global_math_functions_filtering_base::type, float >::value)); - //VERIFY((internal::is_same< internal::global_math_functions_filtering_base::type, ArrayBase >::value)); - //typedef CwiseUnaryOp, ArrayXd > Xpr; - //VERIFY((internal::is_same< internal::global_math_functions_filtering_base::type, - // ArrayBase - // >::value)); + VERIFY((internal::is_same< internal::global_math_functions_filtering_base::type, int >::value)); + VERIFY((internal::is_same< internal::global_math_functions_filtering_base::type, float >::value)); + VERIFY((internal::is_same< internal::global_math_functions_filtering_base::type, ArrayBase >::value)); + typedef CwiseUnaryOp, ArrayXd > Xpr; + VERIFY((internal::is_same< internal::global_math_functions_filtering_base::type, + ArrayBase + >::value)); }