diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2013-06-10 23:40:56 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2013-06-10 23:40:56 +0200 |
| commit | 62670c83a0ba7cb4f45a734a4817a818a7c92bba (patch) | |
| tree | 67a8f3fa859f51c59be420acd9dede0c1f820d3a /test/array_for_matrix.cpp | |
| parent | 827843bbbdb5a27019d7d679f371a3a69053c762 (diff) | |
Fix bug #314: move remaining math functions from internal to numext namespace
Diffstat (limited to 'test/array_for_matrix.cpp')
| -rw-r--r-- | test/array_for_matrix.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/array_for_matrix.cpp b/test/array_for_matrix.cpp index 99cda1ffe..1250c9ff5 100644 --- a/test/array_for_matrix.cpp +++ b/test/array_for_matrix.cpp @@ -25,10 +25,10 @@ template<typename MatrixType> void array_for_matrix(const MatrixType& m) ColVectorType cv1 = ColVectorType::Random(rows); RowVectorType rv1 = RowVectorType::Random(cols); - + Scalar s1 = internal::random<Scalar>(), s2 = internal::random<Scalar>(); - + // scalar addition VERIFY_IS_APPROX(m1.array() + s1, s1 + m1.array()); VERIFY_IS_APPROX((m1.array() + s1).matrix(), MatrixType::Constant(rows,cols,s1) + m1); @@ -138,7 +138,7 @@ template<typename VectorType> void lpNorm(const VectorType& v) VERIFY_IS_APPROX(u.template lpNorm<Infinity>(), u.cwiseAbs().maxCoeff()); VERIFY_IS_APPROX(u.template lpNorm<1>(), u.cwiseAbs().sum()); VERIFY_IS_APPROX(u.template lpNorm<2>(), sqrt(u.array().abs().square().sum())); - VERIFY_IS_APPROX(internal::pow(u.template lpNorm<5>(), typename VectorType::RealScalar(5)), u.array().abs().pow(5).sum()); + VERIFY_IS_APPROX(numext::pow(u.template lpNorm<5>(), typename VectorType::RealScalar(5)), u.array().abs().pow(5).sum()); } template<typename MatrixType> void cwise_min_max(const MatrixType& m) |