diff options
author | Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-04-16 10:13:32 -0400 |
---|---|---|
committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-04-16 10:13:32 -0400 |
commit | ff6a46105d86e92753858c1b2aea8bcaf4575819 (patch) | |
tree | db7644512aa5adaaba50dc3c7f420508951116e5 /Eigen/src/Sparse/SparseProduct.h | |
parent | 1803db6e8409dae534cca51433a6a0fd6e7c7665 (diff) |
* Refactoring of the class hierarchy: introduction of DenseDirectAccessBase, removal of extra _Base/_Options template parameters.
* Introduction of strides-at-compile-time so for example the optimized code really knows when it needs to evaluate to a temporary
* StorageKind / XprKind
* Quaternion::setFromTwoVectors: use JacobiSVD instead of SVD
* ComplexSchur: support the 1x1 case
Diffstat (limited to 'Eigen/src/Sparse/SparseProduct.h')
-rw-r--r-- | Eigen/src/Sparse/SparseProduct.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Eigen/src/Sparse/SparseProduct.h b/Eigen/src/Sparse/SparseProduct.h index efc676a69..4499e88be 100644 --- a/Eigen/src/Sparse/SparseProduct.h +++ b/Eigen/src/Sparse/SparseProduct.h @@ -52,7 +52,7 @@ struct SparseProductReturnType template<typename LhsNested, typename RhsNested> struct ei_traits<SparseProduct<LhsNested, RhsNested> > { - typedef DenseStorageMatrix DenseStorageType; + typedef MatrixXpr XprKind; // clean the nested types: typedef typename ei_cleantype<LhsNested>::type _LhsNested; typedef typename ei_cleantype<RhsNested>::type _RhsNested; @@ -82,7 +82,7 @@ struct ei_traits<SparseProduct<LhsNested, RhsNested> > CoeffReadCost = Dynamic }; - typedef Sparse StorageType; + typedef Sparse StorageKind; typedef SparseMatrixBase<SparseProduct<LhsNested, RhsNested> > Base; }; @@ -489,8 +489,8 @@ template<typename Lhs, typename Rhs> struct ei_traits<SparseTimeDenseProduct<Lhs,Rhs> > : ei_traits<ProductBase<SparseTimeDenseProduct<Lhs,Rhs>, Lhs, Rhs> > { - typedef Dense StorageType; - typedef DenseStorageMatrix DenseStorageType; + typedef Dense StorageKind; + typedef MatrixXpr XprKind; }; template<typename Lhs, typename Rhs> @@ -532,7 +532,7 @@ template<typename Lhs, typename Rhs> struct ei_traits<DenseTimeSparseProduct<Lhs,Rhs> > : ei_traits<ProductBase<DenseTimeSparseProduct<Lhs,Rhs>, Lhs, Rhs> > { - typedef Dense StorageType; + typedef Dense StorageKind; }; template<typename Lhs, typename Rhs> |