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/adjoint.cpp | |
parent | 827843bbbdb5a27019d7d679f371a3a69053c762 (diff) |
Fix bug #314: move remaining math functions from internal to numext namespace
Diffstat (limited to 'test/adjoint.cpp')
-rw-r--r-- | test/adjoint.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/adjoint.cpp b/test/adjoint.cpp index 72ad9e407..b63e843c6 100644 --- a/test/adjoint.cpp +++ b/test/adjoint.cpp @@ -16,7 +16,7 @@ template<bool IsInteger> struct adjoint_specific; template<> struct adjoint_specific<true> { template<typename Vec, typename Mat, typename Scalar> static void run(const Vec& v1, const Vec& v2, Vec& v3, const Mat& square, Scalar s1, Scalar s2) { - VERIFY(test_isApproxWithRef((s1 * v1 + s2 * v2).dot(v3), internal::conj(s1) * v1.dot(v3) + internal::conj(s2) * v2.dot(v3), 0)); + VERIFY(test_isApproxWithRef((s1 * v1 + s2 * v2).dot(v3), numext::conj(s1) * v1.dot(v3) + numext::conj(s2) * v2.dot(v3), 0)); VERIFY(test_isApproxWithRef(v3.dot(s1 * v1 + s2 * v2), s1*v3.dot(v1)+s2*v3.dot(v2), 0)); // check compatibility of dot and adjoint @@ -30,7 +30,7 @@ template<> struct adjoint_specific<false> { typedef typename NumTraits<Scalar>::Real RealScalar; RealScalar ref = NumTraits<Scalar>::IsInteger ? RealScalar(0) : (std::max)((s1 * v1 + s2 * v2).norm(),v3.norm()); - VERIFY(test_isApproxWithRef((s1 * v1 + s2 * v2).dot(v3), internal::conj(s1) * v1.dot(v3) + internal::conj(s2) * v2.dot(v3), ref)); + VERIFY(test_isApproxWithRef((s1 * v1 + s2 * v2).dot(v3), numext::conj(s1) * v1.dot(v3) + numext::conj(s2) * v2.dot(v3), ref)); VERIFY(test_isApproxWithRef(v3.dot(s1 * v1 + s2 * v2), s1*v3.dot(v1)+s2*v3.dot(v2), ref)); VERIFY_IS_APPROX(v1.squaredNorm(), v1.norm() * v1.norm()); @@ -85,11 +85,11 @@ template<typename MatrixType> void adjoint(const MatrixType& m) // check multiplicative behavior VERIFY_IS_APPROX((m1.adjoint() * m2).adjoint(), m2.adjoint() * m1); - VERIFY_IS_APPROX((s1 * m1).adjoint(), internal::conj(s1) * m1.adjoint()); + VERIFY_IS_APPROX((s1 * m1).adjoint(), numext::conj(s1) * m1.adjoint()); // check basic properties of dot, squaredNorm - VERIFY_IS_APPROX(internal::conj(v1.dot(v2)), v2.dot(v1)); - VERIFY_IS_APPROX(internal::real(v1.dot(v1)), v1.squaredNorm()); + VERIFY_IS_APPROX(numext::conj(v1.dot(v2)), v2.dot(v1)); + VERIFY_IS_APPROX(numext::real(v1.dot(v1)), v1.squaredNorm()); adjoint_specific<NumTraits<Scalar>::IsInteger>::run(v1, v2, v3, square, s1, s2); @@ -98,8 +98,8 @@ template<typename MatrixType> void adjoint(const MatrixType& m) // like in testBasicStuff, test operator() to check const-qualification Index r = internal::random<Index>(0, rows-1), c = internal::random<Index>(0, cols-1); - VERIFY_IS_APPROX(m1.conjugate()(r,c), internal::conj(m1(r,c))); - VERIFY_IS_APPROX(m1.adjoint()(c,r), internal::conj(m1(r,c))); + VERIFY_IS_APPROX(m1.conjugate()(r,c), numext::conj(m1(r,c))); + VERIFY_IS_APPROX(m1.adjoint()(c,r), numext::conj(m1(r,c))); // check inplace transpose m3 = m1; |