diff options
| author |  Daniel Gomez Ferro <dgomezferro@gmail.com> | 2008-09-02 15:28:49 +0000 |
|---|---|---|
| committer | Daniel Gomez Ferro <dgomezferro@gmail.com> | 2008-09-02 15:28:49 +0000 |
| commit | 8fb1678f0f174e85f6550e14f349841e406c8f53 (patch) | |
| tree | 8eef447ce588be1dd450cca201f56fe32e36e4b5 /Eigen/src/Core/Block.h | |
| parent | 46fe7a3d9ec14ea56a879c48ba7f15e78342c8cb (diff) | |
Extended sparse unit-test: nested blocks and InnerIterators.
Block specialization for sparse matrices.
InnerIterators for Blocks and fixes in CoreIterators.
Diffstat (limited to 'Eigen/src/Core/Block.h')
| -rw-r--r-- | Eigen/src/Core/Block.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Eigen/src/Core/Block.h b/Eigen/src/Core/Block.h index 11583d042..18fcdbb2b 100644 --- a/Eigen/src/Core/Block.h +++ b/Eigen/src/Core/Block.h @@ -65,6 +65,8 @@ template<typename MatrixType, int BlockRows, int BlockCols, int _PacketAccess, i struct ei_traits<Block<MatrixType, BlockRows, BlockCols, _PacketAccess, _DirectAccessStatus> > { typedef typename MatrixType::Scalar Scalar; + typedef typename MatrixType::Nested MatrixTypeNested; + typedef typename ei_unref<MatrixTypeNested>::type _MatrixTypeNested; enum{ RowsAtCompileTime = MatrixType::RowsAtCompileTime == 1 ? 1 : BlockRows, ColsAtCompileTime = MatrixType::ColsAtCompileTime == 1 ? 1 : BlockCols, @@ -94,6 +96,8 @@ template<typename MatrixType, int BlockRows, int BlockCols, int PacketAccess, in EIGEN_GENERIC_PUBLIC_INTERFACE(Block) + class InnerIterator; + /** Column or Row constructor */ inline Block(const MatrixType& matrix, int i) @@ -217,6 +221,7 @@ class Block<MatrixType,BlockRows,BlockCols,PacketAccess,HasDirectAccess> _EIGEN_GENERIC_PUBLIC_INTERFACE(Block, MapBase<Block>) + class InnerIterator; typedef typename ei_traits<Block>::AlignedDerivedType AlignedDerivedType; EIGEN_INHERIT_ASSIGNMENT_OPERATORS(Block) |