diff options
Diffstat (limited to 'unsupported/Eigen/src/IterativeSolvers')
3 files changed, 5 insertions, 2 deletions
diff --git a/unsupported/Eigen/src/IterativeSolvers/IncompleteCholesky.h b/unsupported/Eigen/src/IterativeSolvers/IncompleteCholesky.h index 5bc41c0f8..746d29473 100644 --- a/unsupported/Eigen/src/IterativeSolvers/IncompleteCholesky.h +++ b/unsupported/Eigen/src/IterativeSolvers/IncompleteCholesky.h @@ -116,6 +116,7 @@ template<typename Scalar, int _UpLo, typename OrderingType> template<typename _MatrixType> void IncompleteCholesky<Scalar,_UpLo, OrderingType>::factorize(const _MatrixType& mat) { + using std::sqrt; eigen_assert(m_analysisIsOk && "analyzePattern() should be called first"); // FIXME Stability: We should probably compute the scaling factors and the shifts that are needed to ensure a succesful LLT factorization and an efficient preconditioner. @@ -182,7 +183,7 @@ void IncompleteCholesky<Scalar,_UpLo, OrderingType>::factorize(const _MatrixType m_info = NumericalIssue; return; } - RealScalar rdiag = internal::sqrt(RealScalar(diag)); + RealScalar rdiag = sqrt(RealScalar(diag)); Scalar scal = Scalar(1)/rdiag; vals[colPtr[j]] = rdiag; // Insert the largest p elements in the matrix and scale them meanwhile diff --git a/unsupported/Eigen/src/IterativeSolvers/IterationController.h b/unsupported/Eigen/src/IterativeSolvers/IterationController.h index aaf46d544..ea86dfef4 100644 --- a/unsupported/Eigen/src/IterativeSolvers/IterationController.h +++ b/unsupported/Eigen/src/IterativeSolvers/IterationController.h @@ -129,7 +129,8 @@ class IterationController bool converged() const { return m_res <= m_rhsn * m_resmax; } bool converged(double nr) { - m_res = internal::abs(nr); + using std::abs; + m_res = abs(nr); m_resminreach = (std::min)(m_resminreach, m_res); return converged(); } diff --git a/unsupported/Eigen/src/IterativeSolvers/MINRES.h b/unsupported/Eigen/src/IterativeSolvers/MINRES.h index 46d7bedc1..6bc1b8f5d 100644 --- a/unsupported/Eigen/src/IterativeSolvers/MINRES.h +++ b/unsupported/Eigen/src/IterativeSolvers/MINRES.h @@ -32,6 +32,7 @@ namespace Eigen { const Preconditioner& precond, int& iters, typename Dest::RealScalar& tol_error) { + using std::sqrt; typedef typename Dest::RealScalar RealScalar; typedef typename Dest::Scalar Scalar; typedef Matrix<Scalar,Dynamic,1> VectorType; |