diff options
| author |  Hauke Heibel <hauke.heibel@gmail.com> | 2010-12-16 17:36:10 +0100 |
|---|---|---|
| committer | Hauke Heibel <hauke.heibel@gmail.com> | 2010-12-16 17:36:10 +0100 |
| commit | 2d0dfe5d60befb92264a22c7ab21593e953ae7d8 (patch) | |
| tree | 54326244b60a8607e6e7e3baf4adf654afcc3b57 /test | |
| parent | f578dc7affb91107e0f6218a846ec062f1b8dc46 (diff) | |
Uups - re-enabled subtests 1 to 5.
Diffstat (limited to 'test')
| -rw-r--r-- | test/array.cpp | 52 |
1 files changed, 26 insertions, 26 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<typename ArrayType> void array_real(const ArrayType& m) void test_array() { for(int i = 0; i < g_repeat; i++) { - //CALL_SUBTEST_1( array(Array<float, 1, 1>()) ); - //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<float, 1, 1>()) ); + 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<float, 1, 1>()) ); - // 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<float, 1, 1>()) ); - // 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<int>::type, int >::value)); - //VERIFY((internal::is_same< internal::global_math_functions_filtering_base<float>::type, float >::value)); - //VERIFY((internal::is_same< internal::global_math_functions_filtering_base<Array2i>::type, ArrayBase<Array2i> >::value)); - //typedef CwiseUnaryOp<internal::scalar_sum_op<double>, ArrayXd > Xpr; - //VERIFY((internal::is_same< internal::global_math_functions_filtering_base<Xpr>::type, - // ArrayBase<Xpr> - // >::value)); + for(int i = 0; i < g_repeat; i++) { + CALL_SUBTEST_1( comparisons(Array<float, 1, 1>()) ); + 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<float, 1, 1>()) ); + 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<int>::type, int >::value)); + VERIFY((internal::is_same< internal::global_math_functions_filtering_base<float>::type, float >::value)); + VERIFY((internal::is_same< internal::global_math_functions_filtering_base<Array2i>::type, ArrayBase<Array2i> >::value)); + typedef CwiseUnaryOp<internal::scalar_sum_op<double>, ArrayXd > Xpr; + VERIFY((internal::is_same< internal::global_math_functions_filtering_base<Xpr>::type, + ArrayBase<Xpr> + >::value)); } |