GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-04-23 10:09:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Protect min with parenthesis in IncompleteLLT

Browse Source
This commit is contained in:
Gael Guennebaud 2013-02-22 14:41:32 +01:00
parent 59f9400420
commit bd8c9c69e4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
unsupported/Eigen/src/IterativeSolvers/IncompleteCholesky.h
View File

@ -132,6 +132,7 @@ template<typename _MatrixType>
void IncompleteCholesky<Scalar,_UpLo, OrderingType>::factorize(const _MatrixType& mat) void IncompleteCholesky<Scalar,_UpLo, OrderingType>::factorize(const _MatrixType& mat)
{ {
using std::sqrt; using std::sqrt;
using std::min;
eigen_assert(m_analysisIsOk && "analyzePattern() should be called first"); 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 // 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 j = 0; j < n; j++){
for (int k = colPtr[j]; k < colPtr[j+1]; k++) for (int k = colPtr[j]; k < colPtr[j+1]; k++)
vals[k] /= (m_scal(j) * m_scal(rowIdx[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; if(mindiag < Scalar(0.)) m_shift = m_shift - mindiag;