diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2016-07-25 12:35:10 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2016-07-25 12:35:10 +0200 |
| commit | 1b2049fbdad3d9ac292e6a71836a16329fcaf02a (patch) | |
| tree | a76e279e0f843c83bff215d57f9f09c570433e9d /test | |
| parent | b118bc76ebc8bc6447fea1a99ed20a3b54bd0ac1 (diff) | |
Enforce scalar types in calls to max/min (helps with expression template scalar types)
Diffstat (limited to 'test')
| -rw-r--r-- | test/eigensolver_selfadjoint.cpp | 2 | ||||
| -rw-r--r-- | test/qr.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/eigensolver_selfadjoint.cpp b/test/eigensolver_selfadjoint.cpp index cd0ae5c2f..af2b33331 100644 --- a/test/eigensolver_selfadjoint.cpp +++ b/test/eigensolver_selfadjoint.cpp @@ -19,7 +19,7 @@ template<typename MatrixType> void selfadjointeigensolver_essential_check(const { typedef typename MatrixType::Scalar Scalar; typedef typename NumTraits<Scalar>::Real RealScalar; - RealScalar eival_eps = (std::min)(test_precision<RealScalar>(), NumTraits<Scalar>::dummy_precision()*20000); + RealScalar eival_eps = numext::mini<RealScalar>(test_precision<RealScalar>(), NumTraits<Scalar>::dummy_precision()*20000); SelfAdjointEigenSolver<MatrixType> eiSymm(m); VERIFY_IS_EQUAL(eiSymm.info(), Success); diff --git a/test/qr.cpp b/test/qr.cpp index 98738777f..dfcc1e8f9 100644 --- a/test/qr.cpp +++ b/test/qr.cpp @@ -86,7 +86,7 @@ template<typename MatrixType> void qr_invertible() VERIFY_IS_APPROX(log(absdet), qr.logAbsDeterminant()); // This test is tricky if the determinant becomes too small. // Since we generate random numbers with magnitude rrange [0,1], the average determinant is 0.5^size - VERIFY_IS_MUCH_SMALLER_THAN( abs(absdet-qr.absDeterminant()), (max)(RealScalar(pow(0.5,size)),(max)(abs(absdet),abs(qr.absDeterminant()))) ); + VERIFY_IS_MUCH_SMALLER_THAN( abs(absdet-qr.absDeterminant()), numext::maxi(RealScalar(pow(0.5,size)),numext::maxi<RealScalar>(abs(absdet),abs(qr.absDeterminant()))) ); } |