diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2014-10-20 15:55:32 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2014-10-20 15:55:32 +0200 |
| commit | fe57b2f963da832d14f4d7b6d4a9554ceef26e36 (patch) | |
| tree | ed0e5d13ae6dde3f98d012ad3f87570b77e8230d /unsupported/Eigen/src/IterativeSolvers | |
| parent | c12b7896d0ddf95e8f060c93a5cf2fcfa1e6865c (diff) | |
bug #701: workaround (min) and (max) blocking ADL by introducing numext::mini and numext::maxi internal functions and a EIGEN_NOT_A_MACRO macro.
Diffstat (limited to 'unsupported/Eigen/src/IterativeSolvers')
| -rw-r--r-- | unsupported/Eigen/src/IterativeSolvers/IncompleteCholesky.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/unsupported/Eigen/src/IterativeSolvers/IncompleteCholesky.h b/unsupported/Eigen/src/IterativeSolvers/IncompleteCholesky.h index dd43de6b3..35cfa315d 100644 --- a/unsupported/Eigen/src/IterativeSolvers/IncompleteCholesky.h +++ b/unsupported/Eigen/src/IterativeSolvers/IncompleteCholesky.h @@ -126,7 +126,6 @@ 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 @@ -160,7 +159,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 = (min)(vals[colPtr[j]], mindiag); + mindiag = numext::mini(vals[colPtr[j]], mindiag); } if(mindiag < Scalar(0.)) m_shift = m_shift - mindiag; |