commit 2d0dfe5d60befb92264a22c7ab21593e953ae7d8
author Hauke Heibel <hauke.heibel@gmail.com> Thu Dec 16 17:36:10 2010 +0100
committer Hauke Heibel <hauke.heibel@gmail.com> Thu Dec 16 17:36:10 2010 +0100
tree 54326244b60a8607e6e7e3baf4adf654afcc3b57
parent f578dc7affb91107e0f6218a846ec062f1b8dc46

Uups - re-enabled subtests 1 to 5.

test/array.cpp

diff --git a/test/array.cpp b/test/array.cpp
index fc63346..8d73e14 100644
--- a/test/array.cpp
+++ b/test/array.cpp
@@ -204,32 +204,32 @@
 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)) );
-  //}
+  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));
+  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));
 }