diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2017-03-25 14:17:07 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2017-03-25 14:17:07 +0100 |
| commit | 35f7829af10c61e33dd2e2a7a015058e11a11ea0 (patch) | |
| tree | 7135010dcf8fd0a49f3020d52112709bcb883bd6 /eigen/Eigen/src/SparseCore/SparseDot.h | |
| parent | 6e8724193e40a932faf9064b664b529e7301c578 (diff) | |
update
Diffstat (limited to 'eigen/Eigen/src/SparseCore/SparseDot.h')
| -rw-r--r-- | eigen/Eigen/src/SparseCore/SparseDot.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/eigen/Eigen/src/SparseCore/SparseDot.h b/eigen/Eigen/src/SparseCore/SparseDot.h index db39c9a..38bc4aa 100644 --- a/eigen/Eigen/src/SparseCore/SparseDot.h +++ b/eigen/Eigen/src/SparseCore/SparseDot.h @@ -26,7 +26,8 @@ SparseMatrixBase<Derived>::dot(const MatrixBase<OtherDerived>& other) const eigen_assert(size() == other.size()); eigen_assert(other.size()>0 && "you are using a non initialized vector"); - typename Derived::InnerIterator i(derived(),0); + internal::evaluator<Derived> thisEval(derived()); + typename internal::evaluator<Derived>::InnerIterator i(thisEval, 0); Scalar res(0); while (i) { @@ -49,16 +50,12 @@ SparseMatrixBase<Derived>::dot(const SparseMatrixBase<OtherDerived>& other) cons eigen_assert(size() == other.size()); - typedef typename Derived::Nested Nested; - typedef typename OtherDerived::Nested OtherNested; - typedef typename internal::remove_all<Nested>::type NestedCleaned; - typedef typename internal::remove_all<OtherNested>::type OtherNestedCleaned; + internal::evaluator<Derived> thisEval(derived()); + typename internal::evaluator<Derived>::InnerIterator i(thisEval, 0); + + internal::evaluator<OtherDerived> otherEval(other.derived()); + typename internal::evaluator<OtherDerived>::InnerIterator j(otherEval, 0); - Nested nthis(derived()); - OtherNested nother(other.derived()); - - typename NestedCleaned::InnerIterator i(nthis,0); - typename OtherNestedCleaned::InnerIterator j(nother,0); Scalar res(0); while (i && j) { |