diff options
author | Yi Kong <yikong@google.com> | 2022-02-25 15:25:03 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-02-25 15:25:03 +0000 |
commit | 79df15ea886a5fc1b85de433f9b3518c68934bae (patch) | |
tree | fb979fb4cf4f8052c8cc66b1ec9516d91fcd859b /Eigen/src/IterativeLinearSolvers/LeastSquareConjugateGradient.h | |
parent | ca5aa72016f062fd0712bcb86370478de332bca3 (diff) | |
parent | 12ea3a4d62567971576a37d196fde0824f7f0ec9 (diff) | |
download | eigen-79df15ea886a5fc1b85de433f9b3518c68934bae.tar.gz |
Merge changes Iee153445,Iee274471
* changes:
Fix Wunused-parameter warning
Upgrade eigen to 3.4.0
Diffstat (limited to 'Eigen/src/IterativeLinearSolvers/LeastSquareConjugateGradient.h')
-rw-r--r-- | Eigen/src/IterativeLinearSolvers/LeastSquareConjugateGradient.h | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/Eigen/src/IterativeLinearSolvers/LeastSquareConjugateGradient.h b/Eigen/src/IterativeLinearSolvers/LeastSquareConjugateGradient.h index 0aea0e099..203fd0ec6 100644 --- a/Eigen/src/IterativeLinearSolvers/LeastSquareConjugateGradient.h +++ b/Eigen/src/IterativeLinearSolvers/LeastSquareConjugateGradient.h @@ -182,32 +182,14 @@ public: /** \internal */ template<typename Rhs,typename Dest> - void _solve_with_guess_impl(const Rhs& b, Dest& x) const + void _solve_vector_with_guess_impl(const Rhs& b, Dest& x) const { m_iterations = Base::maxIterations(); m_error = Base::m_tolerance; - for(Index j=0; j<b.cols(); ++j) - { - m_iterations = Base::maxIterations(); - m_error = Base::m_tolerance; - - typename Dest::ColXpr xj(x,j); - internal::least_square_conjugate_gradient(matrix(), b.col(j), xj, Base::m_preconditioner, m_iterations, m_error); - } - - m_isInitialized = true; + internal::least_square_conjugate_gradient(matrix(), b, x, Base::m_preconditioner, m_iterations, m_error); m_info = m_error <= Base::m_tolerance ? Success : NoConvergence; } - - /** \internal */ - using Base::_solve_impl; - template<typename Rhs,typename Dest> - void _solve_impl(const MatrixBase<Rhs>& b, Dest& x) const - { - x.setZero(); - _solve_with_guess_impl(b.derived(),x); - } }; |