diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2016-06-23 15:29:57 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2016-06-23 15:29:57 +0200 |
| commit | 7c6561485a64255c0d316bdaa8e0c460c1ecf851 (patch) | |
| tree | acef5cfd70d36b7708535252e0ea91037e5e78f7 /test/array.cpp | |
| parent | a3f7edf7e7672094190e04a0b4417de1abfa3de5 (diff) | |
| parent | 76faf4a9657efeed089aeedc98a769410c32d3d7 (diff) | |
merge PR 194
Diffstat (limited to 'test/array.cpp')
| -rw-r--r-- | test/array.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/array.cpp b/test/array.cpp index 4cd4f262b..0416ec5d2 100644 --- a/test/array.cpp +++ b/test/array.cpp @@ -72,7 +72,7 @@ template<typename ArrayType> void array(const ArrayType& m) VERIFY_IS_MUCH_SMALLER_THAN(abs(m1.rowwise().sum().sum() - m1.sum()), m1.abs().sum()); if (!internal::isMuchSmallerThan(abs(m1.sum() - (m1+m2).sum()), m1.abs().sum(), test_precision<Scalar>())) VERIFY_IS_NOT_APPROX(((m1+m2).rowwise().sum()).sum(), m1.sum()); - VERIFY_IS_APPROX(m1.colwise().sum(), m1.colwise().redux(internal::scalar_sum_op<Scalar>())); + VERIFY_IS_APPROX(m1.colwise().sum(), m1.colwise().redux(internal::scalar_sum_op<Scalar,Scalar>())); // vector-wise ops m3 = m1; @@ -807,7 +807,7 @@ void test_array() 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_multiple_op<double>, ArrayXd > Xpr; + typedef CwiseUnaryOp<internal::scalar_abs_op<double>, ArrayXd > Xpr; VERIFY((internal::is_same< internal::global_math_functions_filtering_base<Xpr>::type, ArrayBase<Xpr> >::value)); |