diff options
| -rw-r--r-- | Eigen/src/Core/VectorwiseOp.h | 19 | ||||
| -rw-r--r-- | Eigen/src/plugins/BlockMethods.h | 29 | ||||
| -rw-r--r-- | test/block.cpp | 7 |
3 files changed, 37 insertions, 18 deletions
diff --git a/Eigen/src/Core/VectorwiseOp.h b/Eigen/src/Core/VectorwiseOp.h index 893bc796f..e44cbd468 100644 --- a/Eigen/src/Core/VectorwiseOp.h +++ b/Eigen/src/Core/VectorwiseOp.h @@ -186,24 +186,7 @@ template<typename ExpressionType, int Direction> class VectorwiseOp }; protected: - - typedef typename internal::conditional<isVertical, - typename ExpressionType::ColXpr, - typename ExpressionType::RowXpr>::type SubVector; - /** \internal - * \returns the i-th subvector according to the \c Direction */ - EIGEN_DEVICE_FUNC - SubVector subVector(Index i) - { - return SubVector(m_matrix.derived(),i); - } - - /** \internal - * \returns the number of subvectors in the direction \c Direction */ - EIGEN_DEVICE_FUNC - Index subVectors() const - { return isVertical?m_matrix.cols():m_matrix.rows(); } - + template<typename OtherDerived> struct ExtendedType { typedef Replicate<OtherDerived, isVertical ? 1 : ExpressionType::RowsAtCompileTime, diff --git a/Eigen/src/plugins/BlockMethods.h b/Eigen/src/plugins/BlockMethods.h index 67fdebc6f..528af05ec 100644 --- a/Eigen/src/plugins/BlockMethods.h +++ b/Eigen/src/plugins/BlockMethods.h @@ -1399,3 +1399,32 @@ innerVectors(Index outerStart, Index outerSize) const IsRowMajor ? outerSize : rows(), IsRowMajor ? cols() : outerSize); } + +/** \returns the i-th subvector (column or vector) according to the \c Direction + * \sa subVectors() + */ +EIGEN_DEVICE_FUNC +template<DirectionType Direction> +typename internal::conditional<Direction==Vertical,ColXpr,RowXpr>::type +subVector(Index i) +{ + return typename internal::conditional<Direction==Vertical,ColXpr,RowXpr>::type(derived(),i); +} + +/** This is the const version of subVector(Index) */ +EIGEN_DEVICE_FUNC +template<DirectionType Direction> +typename internal::conditional<Direction==Vertical,ConstColXpr,ConstRowXpr>::type +subVector(Index i) const +{ + return typename internal::conditional<Direction==Vertical,ConstColXpr,ConstRowXpr>::type(derived(),i); +} + +/** \returns the number of subvectors (rows or columns) in the direction \c Direction + * \sa subVector(Index) + */ +EIGEN_DEVICE_FUNC +template<DirectionType Direction> +Index subVectors() const +{ return (Direction==Vertical)?cols():rows(); } + diff --git a/test/block.cpp b/test/block.cpp index ca13539a9..27b60d778 100644 --- a/test/block.cpp +++ b/test/block.cpp @@ -220,6 +220,13 @@ template<typename MatrixType> void block(const MatrixType& m) VERIFY_RAISES_ASSERT( m1.array() *= m1.col(0).array() ); VERIFY_RAISES_ASSERT( m1.array() /= m1.col(0).array() ); } + + VERIFY_IS_EQUAL( m1.template subVector<Horizontal>(r1), m1.row(r1) ); + VERIFY_IS_APPROX( (m1+m1).template subVector<Horizontal>(r1), (m1+m1).row(r1) ); + VERIFY_IS_EQUAL( m1.template subVector<Vertical>(c1), m1.col(c1) ); + VERIFY_IS_APPROX( (m1+m1).template subVector<Vertical>(c1), (m1+m1).col(c1) ); + VERIFY_IS_EQUAL( m1.template subVectors<Horizontal>(), m1.rows() ); + VERIFY_IS_EQUAL( m1.template subVectors<Vertical>(), m1.cols() ); } |