diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2013-02-27 08:07:18 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2013-02-27 08:07:18 +0100 |
| commit | 455e6e38b6986f9081b07c79e53aa9fa50ce4edd (patch) | |
| tree | acaa31c05088d8d8941ad48f72a564497bcd2a8f | |
| parent | 61a2995d03e8950d706a45589a3aface84bbdba3 (diff) | |
Fix two numerical issues in unit tests.
| -rw-r--r-- | test/array_for_matrix.cpp | 8 | ||||
| -rw-r--r-- | test/ref.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/test/array_for_matrix.cpp b/test/array_for_matrix.cpp index cd8ef03a0..3f29e9f97 100644 --- a/test/array_for_matrix.cpp +++ b/test/array_for_matrix.cpp @@ -42,10 +42,10 @@ template<typename MatrixType> void array_for_matrix(const MatrixType& m) VERIFY_IS_APPROX(m3, (m1.array() - s1).matrix()); // reductions - VERIFY_IS_MUCH_SMALLER_THAN(m1.colwise().sum().sum() - m1.sum(), m1.cwiseAbs().maxCoeff()); - VERIFY_IS_MUCH_SMALLER_THAN(m1.rowwise().sum().sum() - m1.sum(), m1.cwiseAbs().maxCoeff()); - VERIFY_IS_MUCH_SMALLER_THAN(m1.colwise().sum() + m2.colwise().sum() - (m1+m2).colwise().sum(), (m1+m2).cwiseAbs().maxCoeff()); - VERIFY_IS_MUCH_SMALLER_THAN(m1.rowwise().sum() - m2.rowwise().sum() - (m1-m2).rowwise().sum(), (m1-m2).cwiseAbs().maxCoeff()); + VERIFY_IS_MUCH_SMALLER_THAN(m1.colwise().sum().sum() - m1.sum(), m1.norm()); + VERIFY_IS_MUCH_SMALLER_THAN(m1.rowwise().sum().sum() - m1.sum(), m1.norm()); + VERIFY_IS_MUCH_SMALLER_THAN(m1.colwise().sum() + m2.colwise().sum() - (m1+m2).colwise().sum(), (m1+m2).norm()); + VERIFY_IS_MUCH_SMALLER_THAN(m1.rowwise().sum() - m2.rowwise().sum() - (m1-m2).rowwise().sum(), (m1-m2).norm()); VERIFY_IS_APPROX(m1.colwise().sum(), m1.colwise().redux(internal::scalar_sum_op<Scalar>())); // vector-wise ops diff --git a/test/ref.cpp b/test/ref.cpp index 2ca572813..bdc948433 100644 --- a/test/ref.cpp +++ b/test/ref.cpp @@ -42,7 +42,7 @@ template<typename MatrixType> void ref_matrix(const MatrixType& m) typedef Ref<const DynMatrixType> ConstRefDynMat; typedef Ref<RealDynMatrixType , 0, Stride<Dynamic,Dynamic> > RefRealMatWithStride; - Index rows = m.rows(), cols = m.cols(), size = rows*cols; + Index rows = m.rows(), cols = m.cols(); MatrixType m1 = MatrixType::Random(rows, cols), m2 = m1; @@ -136,7 +136,7 @@ template<typename VectorType> void ref_vector(const VectorType& m) VERIFY_IS_EQUAL(mat1, mat2); rm5.noalias() = rm4.transpose() * mat3; mat2.row(i) = v2.real().transpose() * mat3; - VERIFY_IS_EQUAL(mat1, mat2); + VERIFY_IS_APPROX(mat1, mat2); } template<typename PlainObjectType> void check_const_correctness(const PlainObjectType&) |