diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2009-12-17 10:00:35 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2009-12-17 10:00:35 +0100 |
| commit | 34c95029cad15201efb161a59d72f36cbf997f16 (patch) | |
| tree | 3db94cfad47145233e32a9461c3bf199315bd6cd /test | |
| parent | 20339033764ed7c116b77f5593315a1d31c0a40b (diff) | |
a couple of fixes and cleaning
Diffstat (limited to 'test')
| -rw-r--r-- | test/linearstructure.cpp | 46 | ||||
| -rw-r--r-- | test/nomalloc.cpp | 2 |
2 files changed, 24 insertions, 24 deletions
diff --git a/test/linearstructure.cpp b/test/linearstructure.cpp index ac61d108f..3e570f2a0 100644 --- a/test/linearstructure.cpp +++ b/test/linearstructure.cpp @@ -58,30 +58,30 @@ template<typename MatrixType> void linearStructure(const MatrixType& m) VERIFY_IS_APPROX((-m1+m2)*s1, -s1*m1+s1*m2); m3 = m2; m3 += m1; VERIFY_IS_APPROX(m3, m1+m2); -// m3 = m2; m3 -= m1; -// VERIFY_IS_APPROX(m3, m2-m1); -// m3 = m2; m3 *= s1; -// VERIFY_IS_APPROX(m3, s1*m2); -// if(NumTraits<Scalar>::HasFloatingPoint) -// { -// m3 = m2; m3 /= s1; -// VERIFY_IS_APPROX(m3, m2/s1); -// } + m3 = m2; m3 -= m1; + VERIFY_IS_APPROX(m3, m2-m1); + m3 = m2; m3 *= s1; + VERIFY_IS_APPROX(m3, s1*m2); + if(NumTraits<Scalar>::HasFloatingPoint) + { + m3 = m2; m3 /= s1; + VERIFY_IS_APPROX(m3, m2/s1); + } -// // again, test operator() to check const-qualification -// VERIFY_IS_APPROX((-m1)(r,c), -(m1(r,c))); -// VERIFY_IS_APPROX((m1-m2)(r,c), (m1(r,c))-(m2(r,c))); -// VERIFY_IS_APPROX((m1+m2)(r,c), (m1(r,c))+(m2(r,c))); -// VERIFY_IS_APPROX((s1*m1)(r,c), s1*(m1(r,c))); -// VERIFY_IS_APPROX((m1*s1)(r,c), (m1(r,c))*s1); -// if(NumTraits<Scalar>::HasFloatingPoint) -// VERIFY_IS_APPROX((m1/s1)(r,c), (m1(r,c))/s1); -// -// // use .block to disable vectorization and compare to the vectorized version -// VERIFY_IS_APPROX(m1+m1.block(0,0,rows,cols), m1+m1); -// VERIFY_IS_APPROX(m1.cwiseProduct(m1.block(0,0,rows,cols)), m1.cwiseProduct(m1)); -// VERIFY_IS_APPROX(m1 - m1.block(0,0,rows,cols), m1 - m1); -// VERIFY_IS_APPROX(m1.block(0,0,rows,cols) * s1, m1 * s1); + // again, test operator() to check const-qualification + VERIFY_IS_APPROX((-m1)(r,c), -(m1(r,c))); + VERIFY_IS_APPROX((m1-m2)(r,c), (m1(r,c))-(m2(r,c))); + VERIFY_IS_APPROX((m1+m2)(r,c), (m1(r,c))+(m2(r,c))); + VERIFY_IS_APPROX((s1*m1)(r,c), s1*(m1(r,c))); + VERIFY_IS_APPROX((m1*s1)(r,c), (m1(r,c))*s1); + if(NumTraits<Scalar>::HasFloatingPoint) + VERIFY_IS_APPROX((m1/s1)(r,c), (m1(r,c))/s1); + + // use .block to disable vectorization and compare to the vectorized version + VERIFY_IS_APPROX(m1+m1.block(0,0,rows,cols), m1+m1); + VERIFY_IS_APPROX(m1.cwiseProduct(m1.block(0,0,rows,cols)), m1.cwiseProduct(m1)); + VERIFY_IS_APPROX(m1 - m1.block(0,0,rows,cols), m1 - m1); + VERIFY_IS_APPROX(m1.block(0,0,rows,cols) * s1, m1 * s1); } void test_linearstructure() diff --git a/test/nomalloc.cpp b/test/nomalloc.cpp index f228519bf..0452de78d 100644 --- a/test/nomalloc.cpp +++ b/test/nomalloc.cpp @@ -64,7 +64,7 @@ template<typename MatrixType> void nomalloc(const MatrixType& m) VERIFY_IS_APPROX((m1+m2)*s1, s1*m1+s1*m2); VERIFY_IS_APPROX((m1+m2)(r,c), (m1(r,c))+(m2(r,c))); - VERIFY_IS_APPROX(m1.cwiseProduct(m1.block(0,0,rows,cols)), (m1.array()*m1.array())); + VERIFY_IS_APPROX(m1.cwiseProduct(m1.block(0,0,rows,cols)), (m1.array()*m1.array()).asMatrix()); if (MatrixType::RowsAtCompileTime<EIGEN_CACHEFRIENDLY_PRODUCT_THRESHOLD) { // If the matrices are too large, we have better to use the optimized GEMM // routines which allocates temporaries. However, on some platforms |