GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-12 19:59:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Generalize IterativeSolverBase::solve to hanlde any sparse type as the results (instead of SparseMatrix only)

Browse Source
This commit is contained in:
Gael Guennebaud 2016-11-06 20:28:18 +01:00
parent a5c2d8a3cc
commit afc55b1885
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Eigen/src/IterativeLinearSolvers/IterativeSolverBase.h
View File

@ -330,25 +330,27 @@ public:
} }
/** \internal */ /** \internal */
template<typename Rhs, typename DestScalar, int DestOptions, typename DestIndex> template<typename Rhs, typename DestDerived>
void _solve_impl(const Rhs& b, SparseMatrix<DestScalar,DestOptions,DestIndex> &dest) const void _solve_impl(const Rhs& b, SparseMatrixBase<DestDerived> &aDest) const
{ {
eigen_assert(rows()==b.rows()); eigen_assert(rows()==b.rows());
Index rhsCols = b.cols(); Index rhsCols = b.cols();
Index size = b.rows(); Index size = b.rows();
DestDerived& dest(aDest.derived());
typedef typename DestDerived::Scalar DestScalar;
Eigen::Matrix<DestScalar,Dynamic,1> tb(size); Eigen::Matrix<DestScalar,Dynamic,1> tb(size);
Eigen::Matrix<DestScalar,Dynamic,1> tx(cols()); Eigen::Matrix<DestScalar,Dynamic,1> tx(cols());
// We do not directly fill dest because sparse expressions have to be free of aliasing issue. // We do not directly fill dest because sparse expressions have to be free of aliasing issue.
// For non square least-square problems, b and dest might not have the same size whereas they might alias each-other. // For non square least-square problems, b and dest might not have the same size whereas they might alias each-other.
SparseMatrix<DestScalar,DestOptions,DestIndex> tmp(cols(),rhsCols); typename DestDerived::PlainObject tmp(cols(),rhsCols);
for(Index k=0; k<rhsCols; ++k) for(Index k=0; k<rhsCols; ++k)
{ {
tb = b.col(k); tb = b.col(k);
tx = derived().solve(tb); tx = derived().solve(tb);
tmp.col(k) = tx.sparseView(0); tmp.col(k) = tx.sparseView(0);
} }
tmp.swap(dest); dest.swap(tmp);
} }
protected: protected: