diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2016-07-04 17:19:38 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2016-07-04 17:19:38 +0200 |
| commit | fbcfc2f86225891dd21ccdefa4a01b7f9409a992 (patch) | |
| tree | daf1ce97fd7cbc3faf25f6c7810ef6fcf8bd3ffd /Eigen/src/IterativeLinearSolvers | |
| parent | 7f7839c12f9bbd88bee1f3c9d7f5dbbe556045d4 (diff) | |
Add unit test for solveWithGuess, and fix template resolution.
Diffstat (limited to 'Eigen/src/IterativeLinearSolvers')
| -rw-r--r-- | Eigen/src/IterativeLinearSolvers/SolveWithGuess.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Eigen/src/IterativeLinearSolvers/SolveWithGuess.h b/Eigen/src/IterativeLinearSolvers/SolveWithGuess.h index 7d67d3ce2..264f783b8 100644 --- a/Eigen/src/IterativeLinearSolvers/SolveWithGuess.h +++ b/Eigen/src/IterativeLinearSolvers/SolveWithGuess.h @@ -81,7 +81,8 @@ struct evaluator<SolveWithGuess<Decomposition,RhsType, GuessType> > : m_result(solve.rows(), solve.cols()) { ::new (static_cast<Base*>(this)) Base(m_result); - solve.dec()._solve_with_guess_impl(solve.rhs(), m_result, solve().guess()); + m_result = solve.guess(); + solve.dec()._solve_with_guess_impl(solve.rhs(), m_result); } protected: @@ -91,7 +92,7 @@ protected: // Specialization for "dst = dec.solveWithGuess(rhs)" // NOTE we need to specialize it for Dense2Dense to avoid ambiguous specialization error and a Sparse2Sparse specialization must exist somewhere template<typename DstXprType, typename DecType, typename RhsType, typename GuessType, typename Scalar> -struct Assignment<DstXprType, SolveWithGuess<DecType,RhsType,GuessType>, internal::assign_op<Scalar,Scalar>, Dense2Dense, Scalar> +struct Assignment<DstXprType, SolveWithGuess<DecType,RhsType,GuessType>, internal::assign_op<Scalar,Scalar>, Dense2Dense> { typedef SolveWithGuess<DecType,RhsType,GuessType> SrcXprType; static void run(DstXprType &dst, const SrcXprType &src, const internal::assign_op<Scalar,Scalar> &) |