diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2012-11-16 09:02:50 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2012-11-16 09:02:50 +0100 |
| commit | 4e60283289c75f34ea12df14e781399ce733d7d5 (patch) | |
| tree | 329279e0baddd8f2f1ef056fed9b8c112ca0c4fd /Eigen/src/SparseCore/SparseDiagonalProduct.h | |
| parent | 3dc8f8536a080afb427f137b8598d31605fb3f05 (diff) | |
Remove Sparse/InnerVectorSet expression in favor of a more general Block<> specialization for Sparse expression.
The specializations for "InnerPanels" are still preserved for efficiency reasons and because they offer additional usefull features.
Diffstat (limited to 'Eigen/src/SparseCore/SparseDiagonalProduct.h')
| -rw-r--r-- | Eigen/src/SparseCore/SparseDiagonalProduct.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Eigen/src/SparseCore/SparseDiagonalProduct.h b/Eigen/src/SparseCore/SparseDiagonalProduct.h index ccba02124..5ec4018e6 100644 --- a/Eigen/src/SparseCore/SparseDiagonalProduct.h +++ b/Eigen/src/SparseCore/SparseDiagonalProduct.h @@ -118,12 +118,12 @@ class sparse_diagonal_product_inner_iterator_selector <Lhs,Rhs,SparseDiagonalProductType,SDP_IsDiagonal,SDP_IsSparseColMajor> : public CwiseBinaryOp< scalar_product_op<typename Lhs::Scalar>, - SparseInnerVectorSet<Rhs,1>, + typename Rhs::ConstInnerVectorReturnType, typename Lhs::DiagonalVectorType>::InnerIterator { typedef typename CwiseBinaryOp< scalar_product_op<typename Lhs::Scalar>, - SparseInnerVectorSet<Rhs,1>, + typename Rhs::ConstInnerVectorReturnType, typename Lhs::DiagonalVectorType>::InnerIterator Base; typedef typename Lhs::Index Index; Index m_outer; @@ -156,12 +156,12 @@ class sparse_diagonal_product_inner_iterator_selector <Lhs,Rhs,SparseDiagonalProductType,SDP_IsSparseRowMajor,SDP_IsDiagonal> : public CwiseBinaryOp< scalar_product_op<typename Rhs::Scalar>, - SparseInnerVectorSet<Lhs,1>, + typename Lhs::ConstInnerVectorReturnType, Transpose<const typename Rhs::DiagonalVectorType> >::InnerIterator { typedef typename CwiseBinaryOp< scalar_product_op<typename Rhs::Scalar>, - SparseInnerVectorSet<Lhs,1>, + typename Lhs::ConstInnerVectorReturnType, Transpose<const typename Rhs::DiagonalVectorType> >::InnerIterator Base; typedef typename Lhs::Index Index; Index m_outer; |