diff --git a/Eigen/src/Core/DenseBase.h b/Eigen/src/Core/DenseBase.h index 93410670f..c0699f97d 100644 --- a/Eigen/src/Core/DenseBase.h +++ b/Eigen/src/Core/DenseBase.h @@ -578,10 +578,10 @@ template class DenseBase inline DenseStlIterator end(); inline DenseStlIterator end() const; inline DenseStlIterator cend() const; - inline ColsProxy allCols(); - inline ColsProxy allCols() const; - inline RowsProxy allRows(); - inline RowsProxy allRows() const; + inline SubVectorsProxy allCols(); + inline SubVectorsProxy allCols() const; + inline SubVectorsProxy allRows(); + inline SubVectorsProxy allRows() const; #define EIGEN_CURRENT_STORAGE_BASE_CLASS Eigen::DenseBase #define EIGEN_DOC_BLOCK_ADDONS_NOT_INNER_PANEL diff --git a/Eigen/src/Core/StlIterators.h b/Eigen/src/Core/StlIterators.h index b4c618db2..c5ed2f6b9 100644 --- a/Eigen/src/Core/StlIterators.h +++ b/Eigen/src/Core/StlIterators.h @@ -10,16 +10,16 @@ namespace Eigen { template -class DenseStlIteratorBase +class IndexedBasedStlIteratorBase { public: typedef Index difference_type; typedef std::random_access_iterator_tag iterator_category; - DenseStlIteratorBase() : mp_xpr(0), m_index(0) {} - DenseStlIteratorBase(XprType& xpr, Index index) : mp_xpr(&xpr), m_index(index) {} + IndexedBasedStlIteratorBase() : mp_xpr(0), m_index(0) {} + IndexedBasedStlIteratorBase(XprType& xpr, Index index) : mp_xpr(&xpr), m_index(index) {} - void swap(DenseStlIteratorBase& other) { + void swap(IndexedBasedStlIteratorBase& other) { std::swap(mp_xpr,other.mp_xpr); std::swap(m_index,other.m_index); } @@ -30,22 +30,22 @@ public: Derived operator++(int) { Derived prev(derived()); operator++(); return prev;} Derived operator--(int) { Derived prev(derived()); operator--(); return prev;} - friend Derived operator+(const DenseStlIteratorBase& a, Index b) { Derived ret(a.derived()); ret += b; return ret; } - friend Derived operator-(const DenseStlIteratorBase& a, Index b) { Derived ret(a.derived()); ret -= b; return ret; } - friend Derived operator+(Index a, const DenseStlIteratorBase& b) { Derived ret(b.derived()); ret += a; return ret; } - friend Derived operator-(Index a, const DenseStlIteratorBase& b) { Derived ret(b.derived()); ret -= a; return ret; } + friend Derived operator+(const IndexedBasedStlIteratorBase& a, Index b) { Derived ret(a.derived()); ret += b; return ret; } + friend Derived operator-(const IndexedBasedStlIteratorBase& a, Index b) { Derived ret(a.derived()); ret -= b; return ret; } + friend Derived operator+(Index a, const IndexedBasedStlIteratorBase& b) { Derived ret(b.derived()); ret += a; return ret; } + friend Derived operator-(Index a, const IndexedBasedStlIteratorBase& b) { Derived ret(b.derived()); ret -= a; return ret; } Derived& operator+=(Index b) { m_index += b; return derived(); } Derived& operator-=(Index b) { m_index -= b; return derived(); } - difference_type operator-(const DenseStlIteratorBase& other) const { eigen_assert(mp_xpr == other.mp_xpr);return m_index - other.m_index; } + difference_type operator-(const IndexedBasedStlIteratorBase& other) const { eigen_assert(mp_xpr == other.mp_xpr);return m_index - other.m_index; } - bool operator==(const DenseStlIteratorBase& other) { eigen_assert(mp_xpr == other.mp_xpr); return m_index == other.m_index; } - bool operator!=(const DenseStlIteratorBase& other) { eigen_assert(mp_xpr == other.mp_xpr); return m_index != other.m_index; } - bool operator< (const DenseStlIteratorBase& other) { eigen_assert(mp_xpr == other.mp_xpr); return m_index < other.m_index; } - bool operator<=(const DenseStlIteratorBase& other) { eigen_assert(mp_xpr == other.mp_xpr); return m_index <= other.m_index; } - bool operator> (const DenseStlIteratorBase& other) { eigen_assert(mp_xpr == other.mp_xpr); return m_index > other.m_index; } - bool operator>=(const DenseStlIteratorBase& other) { eigen_assert(mp_xpr == other.mp_xpr); return m_index >= other.m_index; } + bool operator==(const IndexedBasedStlIteratorBase& other) { eigen_assert(mp_xpr == other.mp_xpr); return m_index == other.m_index; } + bool operator!=(const IndexedBasedStlIteratorBase& other) { eigen_assert(mp_xpr == other.mp_xpr); return m_index != other.m_index; } + bool operator< (const IndexedBasedStlIteratorBase& other) { eigen_assert(mp_xpr == other.mp_xpr); return m_index < other.m_index; } + bool operator<=(const IndexedBasedStlIteratorBase& other) { eigen_assert(mp_xpr == other.mp_xpr); return m_index <= other.m_index; } + bool operator> (const IndexedBasedStlIteratorBase& other) { eigen_assert(mp_xpr == other.mp_xpr); return m_index > other.m_index; } + bool operator>=(const IndexedBasedStlIteratorBase& other) { eigen_assert(mp_xpr == other.mp_xpr); return m_index >= other.m_index; } protected: @@ -57,7 +57,7 @@ protected: }; template -class DenseStlIterator : public DenseStlIteratorBase > +class DenseStlIterator : public IndexedBasedStlIteratorBase > { public: typedef typename XprType::Scalar value_type; @@ -69,7 +69,7 @@ protected: has_write_access = internal::is_lvalue::value }; - typedef DenseStlIteratorBase Base; + typedef IndexedBasedStlIteratorBase Base; using Base::m_index; using Base::mp_xpr; @@ -80,7 +80,6 @@ public: typedef typename internal::conditional::type pointer; typedef typename internal::conditional::type reference; - DenseStlIterator() : Base() {} DenseStlIterator(XprType& xpr, Index index) : Base(xpr,index) {} @@ -90,7 +89,7 @@ public: }; template -void swap(DenseStlIteratorBase& a, DenseStlIteratorBase& b) { +void swap(IndexedBasedStlIteratorBase& a, IndexedBasedStlIteratorBase& b) { a.swap(b); } @@ -134,99 +133,66 @@ inline DenseStlIterator DenseBase::cend() const return DenseStlIterator(derived(), size()); } -template -class DenseColStlIterator : public DenseStlIteratorBase > +template +class SubVectorStlIterator : public IndexedBasedStlIteratorBase > { protected: enum { is_lvalue = internal::is_lvalue::value }; - typedef DenseStlIteratorBase Base; + typedef IndexedBasedStlIteratorBase Base; using Base::m_index; using Base::mp_xpr; + typedef typename internal::conditional::type SubVectorType; + typedef typename internal::conditional::type ConstSubVectorType; + public: - typedef typename internal::conditional::type value_type; + typedef typename internal::conditional::type value_type; typedef value_type* pointer; typedef value_type reference; - DenseColStlIterator() : Base() {} - DenseColStlIterator(XprType& xpr, Index index) : Base(xpr,index) {} + SubVectorStlIterator() : Base() {} + SubVectorStlIterator(XprType& xpr, Index index) : Base(xpr,index) {} - reference operator*() const { return (*mp_xpr).col(m_index); } - reference operator[](Index i) const { return (*mp_xpr).col(m_index+i); } - pointer operator->() const { return &((*mp_xpr).col(m_index)); } + reference operator*() const { return (*mp_xpr).template subVector(m_index); } + reference operator[](Index i) const { return (*mp_xpr).template subVector(m_index+i); } + pointer operator->() const { return &((*mp_xpr).template subVector(m_index)); } }; -template -class DenseRowStlIterator : public DenseStlIteratorBase > -{ -protected: - - enum { is_lvalue = internal::is_lvalue::value }; - - typedef DenseStlIteratorBase Base; - using Base::m_index; - using Base::mp_xpr; - -public: - typedef typename internal::conditional::type value_type; - typedef value_type* pointer; - typedef value_type reference; - - DenseRowStlIterator() : Base() {} - DenseRowStlIterator(XprType& xpr, Index index) : Base(xpr,index) {} - - reference operator*() const { return (*mp_xpr).row(m_index); } - reference operator[](Index i) const { return (*mp_xpr).row(m_index+i); } - pointer operator->() const { return &((*mp_xpr).row(m_index)); } -}; - - -template -class ColsProxy +template +class SubVectorsProxy { public: - ColsProxy(Xpr& xpr) : m_xpr(xpr) {} - DenseColStlIterator begin() const { return DenseColStlIterator(m_xpr, 0); } - DenseColStlIterator cbegin() const { return DenseColStlIterator(m_xpr, 0); } + typedef SubVectorStlIterator iterator; + typedef SubVectorStlIterator const_iterator; - DenseColStlIterator end() const { return DenseColStlIterator(m_xpr, m_xpr.cols()); } - DenseColStlIterator cend() const { return DenseColStlIterator(m_xpr, m_xpr.cols()); } + SubVectorsProxy(XprType& xpr) : m_xpr(xpr) {} + + iterator begin() const { return iterator (m_xpr, 0); } + const_iterator cbegin() const { return const_iterator(m_xpr, 0); } + + iterator end() const { return iterator (m_xpr, m_xpr.template subVectors()); } + const_iterator cend() const { return const_iterator(m_xpr, m_xpr.template subVectors()); } protected: - Xpr& m_xpr; -}; - -template -class RowsProxy -{ -public: - RowsProxy(Xpr& xpr) : m_xpr(xpr) {} - DenseRowStlIterator begin() const { return DenseRowStlIterator(m_xpr, 0); } - DenseRowStlIterator cbegin() const { return DenseRowStlIterator(m_xpr, 0); } - - DenseRowStlIterator end() const { return DenseRowStlIterator(m_xpr, m_xpr.rows()); } - DenseRowStlIterator cend() const { return DenseRowStlIterator(m_xpr, m_xpr.rows()); } - -protected: - Xpr& m_xpr; + XprType& m_xpr; }; template -ColsProxy DenseBase::allCols() -{ return ColsProxy(derived()); } +SubVectorsProxy DenseBase::allCols() +{ return SubVectorsProxy(derived()); } template -ColsProxy DenseBase::allCols() const -{ return ColsProxy(derived()); } +SubVectorsProxy DenseBase::allCols() const +{ return SubVectorsProxy(derived()); } template -RowsProxy DenseBase::allRows() -{ return RowsProxy(derived()); } +SubVectorsProxy DenseBase::allRows() +{ return SubVectorsProxy(derived()); } template -RowsProxy DenseBase::allRows() const -{ return RowsProxy(derived()); } +SubVectorsProxy DenseBase::allRows() const +{ return SubVectorsProxy(derived()); } } // namespace Eigen diff --git a/Eigen/src/Core/util/ForwardDeclarations.h b/Eigen/src/Core/util/ForwardDeclarations.h index d2532d854..8ed8dd09b 100644 --- a/Eigen/src/Core/util/ForwardDeclarations.h +++ b/Eigen/src/Core/util/ForwardDeclarations.h @@ -134,8 +134,7 @@ template class MatrixWrapper; template class SolverBase; template class InnerIterator; template class DenseStlIterator; -template class ColsProxy; -template class RowsProxy; +template class SubVectorsProxy; namespace internal { template struct kernel_retval_base;