diff options
author | Gael Guennebaud <g.gael@free.fr> | 2013-02-22 14:41:32 +0100 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2013-02-22 14:41:32 +0100 |
commit | bd8c9c69e4b32384d161f097e769ece68b227cf4 (patch) | |
tree | 44d57e92d66b921713c55fe565872a7e663b9985 /unsupported | |
parent | 59f94004202f534f7693c29b55516a9b495ffe4d (diff) |
Protect min with parenthesis in IncompleteLLT
Diffstat (limited to 'unsupported')
-rw-r--r-- | unsupported/Eigen/src/IterativeSolvers/IncompleteCholesky.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/unsupported/Eigen/src/IterativeSolvers/IncompleteCholesky.h b/unsupported/Eigen/src/IterativeSolvers/IncompleteCholesky.h index b4a67ded0..96a11a144 100644 --- a/unsupported/Eigen/src/IterativeSolvers/IncompleteCholesky.h +++ b/unsupported/Eigen/src/IterativeSolvers/IncompleteCholesky.h @@ -132,6 +132,7 @@ template<typename _MatrixType> void IncompleteCholesky<Scalar,_UpLo, OrderingType>::factorize(const _MatrixType& mat) { using std::sqrt; + using std::min; eigen_assert(m_analysisIsOk && "analyzePattern() should be called first"); // Dropping strategies : Keep only the p largest elements per column, where p is the number of elements in the column of the original matrix. Other strategies will be added @@ -165,7 +166,7 @@ void IncompleteCholesky<Scalar,_UpLo, OrderingType>::factorize(const _MatrixType for (int j = 0; j < n; j++){ for (int k = colPtr[j]; k < colPtr[j+1]; k++) vals[k] /= (m_scal(j) * m_scal(rowIdx[k])); - mindiag = std::min(vals[colPtr[j]], mindiag); + mindiag = (min)(vals[colPtr[j]], mindiag); } if(mindiag < Scalar(0.)) m_shift = m_shift - mindiag; |