diff --git a/test/array.cpp b/test/array.cpp index ea397388d..8b4652561 100644 --- a/test/array.cpp +++ b/test/array.cpp @@ -67,6 +67,7 @@ template void array(const MatrixType& m) template void comparisons(const MatrixType& m) { typedef typename MatrixType::Scalar Scalar; + typedef typename NumTraits::Real RealScalar; typedef Matrix VectorType; int rows = m.rows(); @@ -113,9 +114,9 @@ template void comparisons(const MatrixType& m) VERIFY_IS_APPROX( (m1.cwise().abs().cwise()0.5).count() == rows*cols); - VERIFY_IS_APPROX(((m1.cwise().abs().cwise()+1).cwise()>0.5).colwise().count(), RowVectorXi::Constant(cols,rows)); - VERIFY_IS_APPROX(((m1.cwise().abs().cwise()+1).cwise()>0.5).rowwise().count(), VectorXi::Constant(rows, cols)); + VERIFY(((m1.cwise().abs().cwise()+1).cwise()>RealScalar(0.1)).count() == rows*cols); + VERIFY_IS_APPROX(((m1.cwise().abs().cwise()+1).cwise()>RealScalar(0.1)).colwise().count(), RowVectorXi::Constant(cols,rows)); + VERIFY_IS_APPROX(((m1.cwise().abs().cwise()+1).cwise()>RealScalar(0.1)).rowwise().count(), VectorXi::Constant(rows, cols)); } template void lpNorm(const VectorType& v) diff --git a/test/cwiseop.cpp b/test/cwiseop.cpp index 3d98845b1..1987f7482 100644 --- a/test/cwiseop.cpp +++ b/test/cwiseop.cpp @@ -106,10 +106,10 @@ template void cwiseops(const MatrixType& m) VERIFY_IS_APPROX(m1.cwise().abs().cwise().log().cwise().exp() , m1.cwise().abs()); VERIFY_IS_APPROX(m1.cwise().pow(2), m1.cwise().square()); - m3 = (m1.cwise().abs().cwise()<0.01).select(mones,m1); + m3 = (m1.cwise().abs().cwise()<=RealScalar(0.01)).select(mones,m1); VERIFY_IS_APPROX(m3.cwise().pow(-1), m3.cwise().inverse()); m3 = m1.cwise().abs(); - VERIFY_IS_APPROX(m3.cwise().pow(0.5), m3.cwise().sqrt()); + VERIFY_IS_APPROX(m3.cwise().pow(RealScalar(0.5)), m3.cwise().sqrt()); // VERIFY_IS_APPROX(m1.cwise().tan(), m1.cwise().sin().cwise() / m1.cwise().cos()); VERIFY_IS_APPROX(mones, m1.cwise().sin().cwise().square() + m1.cwise().cos().cwise().square());