diff options
author | Gael Guennebaud <g.gael@free.fr> | 2010-01-04 19:13:08 +0100 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2010-01-04 19:13:08 +0100 |
commit | 71a171c267df54118cda01d845d42f3d3d465de3 (patch) | |
tree | 9432398656cee78e36fde1841cf7453af18dae2f /Eigen | |
parent | b6898996d4107b5823fc0fdaa22bfe0811716863 (diff) |
s/asMatrix()/matrix()
Diffstat (limited to 'Eigen')
-rw-r--r-- | Eigen/src/Array/ArrayBase.h | 6 | ||||
-rw-r--r-- | Eigen/src/Array/ArrayWrapper.h | 19 | ||||
-rw-r--r-- | Eigen/src/Core/CwiseUnaryOp.h | 12 | ||||
-rw-r--r-- | Eigen/src/Core/CwiseUnaryView.h | 12 | ||||
-rw-r--r-- | Eigen/src/Core/Transpose.h | 26 |
5 files changed, 47 insertions, 28 deletions
diff --git a/Eigen/src/Array/ArrayBase.h b/Eigen/src/Array/ArrayBase.h index 1ec2a3516..d846c4a9c 100644 --- a/Eigen/src/Array/ArrayBase.h +++ b/Eigen/src/Array/ArrayBase.h @@ -154,11 +154,11 @@ template<typename Derived> class ArrayBase { return cwiseNotEqual(other).all(); } public: - MatrixWrapper<Derived> asMatrix() { return derived(); } - const MatrixWrapper<Derived> asMatrix() const { return derived(); } + MatrixWrapper<Derived> matrix() { return derived(); } + const MatrixWrapper<Derived> matrix() const { return derived(); } // template<typename Dest> -// inline void evalTo(Dest& dst) const { dst = asMatrix(); } +// inline void evalTo(Dest& dst) const { dst = matrix(); } protected: ArrayBase() : Base() {} diff --git a/Eigen/src/Array/ArrayWrapper.h b/Eigen/src/Array/ArrayWrapper.h index 5850b6cb5..b62d66d8c 100644 --- a/Eigen/src/Array/ArrayWrapper.h +++ b/Eigen/src/Array/ArrayWrapper.h @@ -25,6 +25,15 @@ #ifndef EIGEN_ARRAYWRAPPER_H #define EIGEN_ARRAYWRAPPER_H +/** \class ArrayWrapper + * + * \brief Expression of a mathematical vector or matrix as an array object + * + * This class is the return type of MatrixBase::array(), and most of the time + * this is the only way it is use. + * + * \sa MatrixBase::array(), class MatrixWrapper + */ template<typename ExpressionType> struct ei_traits<ArrayWrapper<ExpressionType> > : public ei_traits<ExpressionType> @@ -97,6 +106,16 @@ class ArrayWrapper : public ArrayBase<ArrayWrapper<ExpressionType> > const ExpressionType& m_expression; }; +/** \class MatrixWrapper + * + * \brief Expression of an array as a mathematical vector or matrix + * + * This class is the return type of ArrayBase::matrix(), and most of the time + * this is the only way it is use. + * + * \sa MatrixBase::matrix(), class ArrayWrapper + */ + template<typename ExpressionType> struct ei_traits<MatrixWrapper<ExpressionType> > : public ei_traits<ExpressionType> diff --git a/Eigen/src/Core/CwiseUnaryOp.h b/Eigen/src/Core/CwiseUnaryOp.h index b4da532e6..1abf0fffb 100644 --- a/Eigen/src/Core/CwiseUnaryOp.h +++ b/Eigen/src/Core/CwiseUnaryOp.h @@ -98,9 +98,9 @@ template<typename UnaryOp, typename MatrixType> class CwiseUnaryOpImpl<UnaryOp,MatrixType,Dense> : public MatrixType::template MakeBase< CwiseUnaryOp<UnaryOp, MatrixType> >::Type { - const typename ei_cleantype<typename MatrixType::Nested>::type& matrix() const + const typename ei_cleantype<typename MatrixType::Nested>::type& nestedExpression() const { return derived().nestedExpression(); } - typename ei_cleantype<typename MatrixType::Nested>::type& matrix() + typename ei_cleantype<typename MatrixType::Nested>::type& nestedExpression() { return derived().nestedExpression(); } public: @@ -111,24 +111,24 @@ class CwiseUnaryOpImpl<UnaryOp,MatrixType,Dense> EIGEN_STRONG_INLINE const Scalar coeff(int row, int col) const { - return derived()._functor()(matrix().coeff(row, col)); + return derived()._functor()(nestedExpression().coeff(row, col)); } template<int LoadMode> EIGEN_STRONG_INLINE PacketScalar packet(int row, int col) const { - return derived()._functor().packetOp(matrix().template packet<LoadMode>(row, col)); + return derived()._functor().packetOp(nestedExpression().template packet<LoadMode>(row, col)); } EIGEN_STRONG_INLINE const Scalar coeff(int index) const { - return derived()._functor()(matrix().coeff(index)); + return derived()._functor()(nestedExpression().coeff(index)); } template<int LoadMode> EIGEN_STRONG_INLINE PacketScalar packet(int index) const { - return derived()._functor().packetOp(matrix().template packet<LoadMode>(index)); + return derived()._functor().packetOp(nestedExpression().template packet<LoadMode>(index)); } }; diff --git a/Eigen/src/Core/CwiseUnaryView.h b/Eigen/src/Core/CwiseUnaryView.h index b21fa56c6..2ff5d3d45 100644 --- a/Eigen/src/Core/CwiseUnaryView.h +++ b/Eigen/src/Core/CwiseUnaryView.h @@ -90,9 +90,9 @@ class CwiseUnaryView : ei_no_assignment_operator, template<typename ViewOp, typename MatrixType> class CwiseUnaryViewImpl<ViewOp,MatrixType,Dense> : public MatrixBase<CwiseUnaryView<ViewOp, MatrixType> > { - const typename ei_cleantype<typename MatrixType::Nested>::type& matrix() const + const typename ei_cleantype<typename MatrixType::Nested>::type& nestedExpression() const { return derived().nestedExpression(); } - typename ei_cleantype<typename MatrixType::Nested>::type& matrix() + typename ei_cleantype<typename MatrixType::Nested>::type& nestedExpression() { return derived().nestedExpression(); } public: @@ -102,22 +102,22 @@ class CwiseUnaryViewImpl<ViewOp,MatrixType,Dense> : public MatrixBase<CwiseUnary EIGEN_STRONG_INLINE const Scalar coeff(int row, int col) const { - return derived()._functor()(matrix().coeff(row, col)); + return derived()._functor()(nestedExpression().coeff(row, col)); } EIGEN_STRONG_INLINE const Scalar coeff(int index) const { - return derived()._functor()(matrix().coeff(index)); + return derived()._functor()(nestedExpression().coeff(index)); } EIGEN_STRONG_INLINE Scalar& coeffRef(int row, int col) { - return derived()._functor()(matrix().const_cast_derived().coeffRef(row, col)); + return derived()._functor()(nestedExpression().const_cast_derived().coeffRef(row, col)); } EIGEN_STRONG_INLINE Scalar& coeffRef(int index) { - return derived()._functor()(matrix().const_cast_derived().coeffRef(index)); + return derived()._functor()(nestedExpression().const_cast_derived().coeffRef(index)); } }; diff --git a/Eigen/src/Core/Transpose.h b/Eigen/src/Core/Transpose.h index 63d77f134..fcc07e916 100644 --- a/Eigen/src/Core/Transpose.h +++ b/Eigen/src/Core/Transpose.h @@ -92,9 +92,9 @@ template<typename MatrixType> class Transpose template<typename MatrixType> class TransposeImpl<MatrixType,Dense> : public MatrixType::template MakeBase<Transpose<MatrixType> >::Type { - const typename ei_cleantype<typename MatrixType::Nested>::type& matrix() const + const typename ei_cleantype<typename MatrixType::Nested>::type& nestedExpression() const { return derived().nestedExpression(); } - typename ei_cleantype<typename MatrixType::Nested>::type& matrix() + typename ei_cleantype<typename MatrixType::Nested>::type& nestedExpression() { return derived().nestedExpression(); } public: @@ -105,52 +105,52 @@ template<typename MatrixType> class TransposeImpl<MatrixType,Dense> // EIGEN_EXPRESSION_IMPL_COMMON(MatrixBase<Transpose<MatrixType> >) - inline int stride() const { return matrix().stride(); } - inline Scalar* data() { return matrix().data(); } - inline const Scalar* data() const { return matrix().data(); } + inline int stride() const { return nestedExpression().stride(); } + inline Scalar* data() { return nestedExpression().data(); } + inline const Scalar* data() const { return nestedExpression().data(); } inline Scalar& coeffRef(int row, int col) { - return matrix().const_cast_derived().coeffRef(col, row); + return nestedExpression().const_cast_derived().coeffRef(col, row); } inline Scalar& coeffRef(int index) { - return matrix().const_cast_derived().coeffRef(index); + return nestedExpression().const_cast_derived().coeffRef(index); } inline const CoeffReturnType coeff(int row, int col) const { - return matrix().coeff(col, row); + return nestedExpression().coeff(col, row); } inline const CoeffReturnType coeff(int index) const { - return matrix().coeff(index); + return nestedExpression().coeff(index); } template<int LoadMode> inline const PacketScalar packet(int row, int col) const { - return matrix().template packet<LoadMode>(col, row); + return nestedExpression().template packet<LoadMode>(col, row); } template<int LoadMode> inline void writePacket(int row, int col, const PacketScalar& x) { - matrix().const_cast_derived().template writePacket<LoadMode>(col, row, x); + nestedExpression().const_cast_derived().template writePacket<LoadMode>(col, row, x); } template<int LoadMode> inline const PacketScalar packet(int index) const { - return matrix().template packet<LoadMode>(index); + return nestedExpression().template packet<LoadMode>(index); } template<int LoadMode> inline void writePacket(int index, const PacketScalar& x) { - matrix().const_cast_derived().template writePacket<LoadMode>(index, x); + nestedExpression().const_cast_derived().template writePacket<LoadMode>(index, x); } }; |