Chris@16: // Chris@16: // Copyright (c) 2000-2002 Chris@16: // Joerg Walter, Mathias Koch Chris@16: // Chris@16: // Distributed under the Boost Software License, Version 1.0. (See Chris@16: // accompanying file LICENSE_1_0.txt or copy at Chris@16: // http://www.boost.org/LICENSE_1_0.txt) Chris@16: // Chris@16: // The authors gratefully acknowledge the support of Chris@16: // GeNeSys mbH & Co. KG in producing this work. Chris@16: // Chris@16: Chris@16: #ifndef _BOOST_UBLAS_MATRIX_PROXY_ Chris@16: #define _BOOST_UBLAS_MATRIX_PROXY_ Chris@16: Chris@16: #include Chris@16: #include Chris@16: #include Chris@16: #include Chris@16: Chris@16: // Iterators based on ideas of Jeremy Siek Chris@16: Chris@16: namespace boost { namespace numeric { namespace ublas { Chris@16: Chris@16: /** \brief Chris@16: */ Chris@16: template Chris@16: class matrix_row: Chris@16: public vector_expression > { Chris@16: Chris@16: typedef matrix_row self_type; Chris@16: public: Chris@16: #ifdef BOOST_UBLAS_ENABLE_PROXY_SHORTCUTS Chris@16: using vector_expression::operator (); Chris@16: #endif Chris@16: typedef M matrix_type; Chris@16: typedef typename M::size_type size_type; Chris@16: typedef typename M::difference_type difference_type; Chris@16: typedef typename M::value_type value_type; Chris@16: typedef typename M::const_reference const_reference; Chris@16: typedef typename boost::mpl::if_, Chris@16: typename M::const_reference, Chris@16: typename M::reference>::type reference; Chris@16: typedef typename boost::mpl::if_, Chris@16: typename M::const_closure_type, Chris@16: typename M::closure_type>::type matrix_closure_type; Chris@16: typedef const self_type const_closure_type; Chris@16: typedef self_type closure_type; Chris@16: typedef typename storage_restrict_traits::storage_category storage_category; Chris@16: Chris@16: // Construction and destruction Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_row (matrix_type &data, size_type i): Chris@16: data_ (data), i_ (i) { Chris@16: // Early checking of preconditions here. Chris@16: // BOOST_UBLAS_CHECK (i_ < data_.size1 (), bad_index ()); Chris@16: } Chris@16: Chris@16: // Accessors Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type size () const { Chris@16: return data_.size2 (); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index () const { Chris@16: return i_; Chris@16: } Chris@16: Chris@16: // Storage accessors Chris@16: BOOST_UBLAS_INLINE Chris@16: const matrix_closure_type &data () const { Chris@16: return data_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_closure_type &data () { Chris@16: return data_; Chris@16: } Chris@16: Chris@16: // Element access Chris@16: #ifndef BOOST_UBLAS_PROXY_CONST_MEMBER Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator () (size_type j) const { Chris@16: return data_ (i_, j); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator () (size_type j) { Chris@16: return data_ (i_, j); Chris@16: } Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator [] (size_type j) const { Chris@16: return (*this) (j); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator [] (size_type j) { Chris@16: return (*this) (j); Chris@16: } Chris@16: #else Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator () (size_type j) const { Chris@16: return data_ (i_, j); Chris@16: } Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator [] (size_type j) const { Chris@16: return (*this) (j); Chris@16: } Chris@16: #endif Chris@16: Chris@16: // Assignment Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_row &operator = (const matrix_row &mr) { Chris@16: // ISSUE need a temporary, proxy can be overlaping alias Chris@16: vector_assign (*this, typename vector_temporary_traits::type (mr)); Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_row &assign_temporary (matrix_row &mr) { Chris@16: // assign elements, proxied container remains the same Chris@16: vector_assign (*this, mr); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_row &operator = (const vector_expression &ae) { Chris@16: vector_assign (*this, typename vector_temporary_traits::type (ae)); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_row &assign (const vector_expression &ae) { Chris@16: vector_assign (*this, ae); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_row &operator += (const vector_expression &ae) { Chris@16: vector_assign (*this, typename vector_temporary_traits::type (*this + ae)); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_row &plus_assign (const vector_expression &ae) { Chris@16: vector_assign (*this, ae); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_row &operator -= (const vector_expression &ae) { Chris@16: vector_assign (*this, typename vector_temporary_traits::type (*this - ae)); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_row &minus_assign (const vector_expression &ae) { Chris@16: vector_assign (*this, ae); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_row &operator *= (const AT &at) { Chris@16: vector_assign_scalar (*this, at); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_row &operator /= (const AT &at) { Chris@16: vector_assign_scalar (*this, at); Chris@16: return *this; Chris@16: } Chris@16: Chris@16: // Closure comparison Chris@16: BOOST_UBLAS_INLINE Chris@16: bool same_closure (const matrix_row &mr) const { Chris@16: return (*this).data_.same_closure (mr.data_); Chris@16: } Chris@16: Chris@16: // Comparison Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator == (const matrix_row &mr) const { Chris@16: return (*this).data_ == mr.data_ && index () == mr.index (); Chris@16: } Chris@16: Chris@16: // Swapping Chris@16: BOOST_UBLAS_INLINE Chris@16: void swap (matrix_row mr) { Chris@16: if (this != &mr) { Chris@16: BOOST_UBLAS_CHECK (size () == mr.size (), bad_size ()); Chris@16: // Sparse ranges may be nonconformant now. Chris@16: // std::swap_ranges (begin (), end (), mr.begin ()); Chris@16: vector_swap (*this, mr); Chris@16: } Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: friend void swap (matrix_row mr1, matrix_row mr2) { Chris@16: mr1.swap (mr2); Chris@16: } Chris@16: Chris@16: // Iterator types Chris@16: private: Chris@16: typedef typename M::const_iterator2 const_subiterator_type; Chris@16: typedef typename boost::mpl::if_, Chris@16: typename M::const_iterator2, Chris@16: typename M::iterator2>::type subiterator_type; Chris@16: Chris@16: public: Chris@16: #ifdef BOOST_UBLAS_USE_INDEXED_ITERATOR Chris@16: typedef indexed_iterator, Chris@16: typename subiterator_type::iterator_category> iterator; Chris@16: typedef indexed_const_iterator, Chris@16: typename const_subiterator_type::iterator_category> const_iterator; Chris@16: #else Chris@16: class const_iterator; Chris@16: class iterator; Chris@16: #endif Chris@16: Chris@16: // Element lookup Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator find (size_type j) const { Chris@16: const_subiterator_type it2 (data_.find2 (1, i_, j)); Chris@16: #ifdef BOOST_UBLAS_USE_INDEXED_ITERATOR Chris@16: return const_iterator (*this, it2.index2 ()); Chris@16: #else Chris@16: return const_iterator (*this, it2); Chris@16: #endif Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator find (size_type j) { Chris@16: subiterator_type it2 (data_.find2 (1, i_, j)); Chris@16: #ifdef BOOST_UBLAS_USE_INDEXED_ITERATOR Chris@16: return iterator (*this, it2.index2 ()); Chris@16: #else Chris@16: return iterator (*this, it2); Chris@16: #endif Chris@16: } Chris@16: Chris@16: #ifndef BOOST_UBLAS_USE_INDEXED_ITERATOR Chris@16: class const_iterator: Chris@16: public container_const_reference, Chris@16: public iterator_base_traits::template Chris@16: iterator_base::type { Chris@16: public: Chris@16: typedef typename const_subiterator_type::value_type value_type; Chris@16: typedef typename const_subiterator_type::difference_type difference_type; Chris@16: typedef typename const_subiterator_type::reference reference; Chris@16: typedef typename const_subiterator_type::pointer pointer; Chris@16: Chris@16: // Construction and destruction Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator (): Chris@16: container_const_reference (), it_ () {} Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator (const self_type &mr, const const_subiterator_type &it): Chris@16: container_const_reference (mr), it_ (it) {} Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator (const typename self_type::iterator &it): // ISSUE self_type:: stops VC8 using std::iterator here Chris@16: container_const_reference (it ()), it_ (it.it_) {} Chris@16: Chris@16: // Arithmetic Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator &operator ++ () { Chris@16: ++ it_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator &operator -- () { Chris@16: -- it_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator &operator += (difference_type n) { Chris@16: it_ += n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator &operator -= (difference_type n) { Chris@16: it_ -= n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: difference_type operator - (const const_iterator &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return it_ - it.it_; Chris@16: } Chris@16: Chris@16: // Dereference Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator * () const { Chris@16: BOOST_UBLAS_CHECK (index () < (*this) ().size (), bad_index ()); Chris@16: return *it_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator [] (difference_type n) const { Chris@16: return *(*this + n); Chris@16: } Chris@16: Chris@16: // Index Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index () const { Chris@16: return it_.index2 (); Chris@16: } Chris@16: Chris@16: // Assignment Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator &operator = (const const_iterator &it) { Chris@16: container_const_reference::assign (&it ()); Chris@16: it_ = it.it_; Chris@16: return *this; Chris@16: } Chris@16: Chris@16: // Comparison Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator == (const const_iterator &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return it_ == it.it_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator < (const const_iterator &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return it_ < it.it_; Chris@16: } Chris@16: Chris@16: private: Chris@16: const_subiterator_type it_; Chris@16: }; Chris@16: #endif Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator begin () const { Chris@16: return find (0); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@101: const_iterator cbegin () const { Chris@101: return begin (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@16: const_iterator end () const { Chris@16: return find (size ()); Chris@16: } Chris@101: BOOST_UBLAS_INLINE Chris@101: const_iterator cend () const { Chris@101: return end (); Chris@101: } Chris@16: Chris@16: #ifndef BOOST_UBLAS_USE_INDEXED_ITERATOR Chris@16: class iterator: Chris@16: public container_reference, Chris@16: public iterator_base_traits::template Chris@16: iterator_base::type { Chris@16: public: Chris@16: typedef typename subiterator_type::value_type value_type; Chris@16: typedef typename subiterator_type::difference_type difference_type; Chris@16: typedef typename subiterator_type::reference reference; Chris@16: typedef typename subiterator_type::pointer pointer; Chris@16: Chris@16: // Construction and destruction Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator (): Chris@16: container_reference (), it_ () {} Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator (self_type &mr, const subiterator_type &it): Chris@16: container_reference (mr), it_ (it) {} Chris@16: Chris@16: // Arithmetic Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator &operator ++ () { Chris@16: ++ it_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator &operator -- () { Chris@16: -- it_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator &operator += (difference_type n) { Chris@16: it_ += n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator &operator -= (difference_type n) { Chris@16: it_ -= n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: difference_type operator - (const iterator &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return it_ - it.it_; Chris@16: } Chris@16: Chris@16: // Dereference Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator * () const { Chris@16: BOOST_UBLAS_CHECK (index () < (*this) ().size (), bad_index ()); Chris@16: return *it_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator [] (difference_type n) const { Chris@16: return *(*this + n); Chris@16: } Chris@16: Chris@16: // Index Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index () const { Chris@16: return it_.index2 (); Chris@16: } Chris@16: Chris@16: // Assignment Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator &operator = (const iterator &it) { Chris@16: container_reference::assign (&it ()); Chris@16: it_ = it.it_; Chris@16: return *this; Chris@16: } Chris@16: Chris@16: // Comparison Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator == (const iterator &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return it_ == it.it_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator < (const iterator &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return it_ < it.it_; Chris@16: } Chris@16: Chris@16: private: Chris@16: subiterator_type it_; Chris@16: Chris@16: friend class const_iterator; Chris@16: }; Chris@16: #endif Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator begin () { Chris@16: return find (0); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator end () { Chris@16: return find (size ()); Chris@16: } Chris@16: Chris@16: // Reverse iterator Chris@16: typedef reverse_iterator_base const_reverse_iterator; Chris@16: typedef reverse_iterator_base reverse_iterator; Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reverse_iterator rbegin () const { Chris@16: return const_reverse_iterator (end ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@101: const_reverse_iterator crbegin () const { Chris@101: return rbegin (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@16: const_reverse_iterator rend () const { Chris@16: return const_reverse_iterator (begin ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@101: const_reverse_iterator crend () const { Chris@101: return rend (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@16: reverse_iterator rbegin () { Chris@16: return reverse_iterator (end ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reverse_iterator rend () { Chris@16: return reverse_iterator (begin ()); Chris@16: } Chris@16: Chris@16: private: Chris@16: matrix_closure_type data_; Chris@16: size_type i_; Chris@16: }; Chris@16: Chris@16: // Projections Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_row row (M &data, typename M::size_type i) { Chris@16: return matrix_row (data, i); Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: const matrix_row row (const M &data, typename M::size_type i) { Chris@16: return matrix_row (data, i); Chris@16: } Chris@16: Chris@16: // Specialize temporary Chris@16: template Chris@16: struct vector_temporary_traits< matrix_row > Chris@16: : vector_temporary_traits< M > {} ; Chris@16: template Chris@16: struct vector_temporary_traits< const matrix_row > Chris@16: : vector_temporary_traits< M > {} ; Chris@16: Chris@16: // Matrix based column vector class Chris@16: template Chris@16: class matrix_column: Chris@16: public vector_expression > { Chris@16: Chris@16: typedef matrix_column self_type; Chris@16: public: Chris@16: #ifdef BOOST_UBLAS_ENABLE_PROXY_SHORTCUTS Chris@16: using vector_expression::operator (); Chris@16: #endif Chris@16: typedef M matrix_type; Chris@16: typedef typename M::size_type size_type; Chris@16: typedef typename M::difference_type difference_type; Chris@16: typedef typename M::value_type value_type; Chris@16: typedef typename M::const_reference const_reference; Chris@16: typedef typename boost::mpl::if_, Chris@16: typename M::const_reference, Chris@16: typename M::reference>::type reference; Chris@16: typedef typename boost::mpl::if_, Chris@16: typename M::const_closure_type, Chris@16: typename M::closure_type>::type matrix_closure_type; Chris@16: typedef const self_type const_closure_type; Chris@16: typedef self_type closure_type; Chris@16: typedef typename storage_restrict_traits::storage_category storage_category; Chris@16: Chris@16: // Construction and destruction Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_column (matrix_type &data, size_type j): Chris@16: data_ (data), j_ (j) { Chris@16: // Early checking of preconditions here. Chris@16: // BOOST_UBLAS_CHECK (j_ < data_.size2 (), bad_index ()); Chris@16: } Chris@16: Chris@16: // Accessors Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type size () const { Chris@16: return data_.size1 (); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index () const { Chris@16: return j_; Chris@16: } Chris@16: Chris@16: // Storage accessors Chris@16: BOOST_UBLAS_INLINE Chris@16: const matrix_closure_type &data () const { Chris@16: return data_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_closure_type &data () { Chris@16: return data_; Chris@16: } Chris@16: Chris@16: // Element access Chris@16: #ifndef BOOST_UBLAS_PROXY_CONST_MEMBER Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator () (size_type i) const { Chris@16: return data_ (i, j_); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator () (size_type i) { Chris@16: return data_ (i, j_); Chris@16: } Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator [] (size_type i) const { Chris@16: return (*this) (i); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator [] (size_type i) { Chris@16: return (*this) (i); Chris@16: } Chris@16: #else Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator () (size_type i) const { Chris@16: return data_ (i, j_); Chris@16: } Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator [] (size_type i) const { Chris@16: return (*this) (i); Chris@16: } Chris@16: #endif Chris@16: Chris@16: // Assignment Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_column &operator = (const matrix_column &mc) { Chris@16: // ISSUE need a temporary, proxy can be overlaping alias Chris@16: vector_assign (*this, typename vector_temporary_traits::type (mc)); Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_column &assign_temporary (matrix_column &mc) { Chris@16: // assign elements, proxied container remains the same Chris@16: vector_assign (*this, mc); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_column &operator = (const vector_expression &ae) { Chris@16: vector_assign (*this, typename vector_temporary_traits::type (ae)); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_column &assign (const vector_expression &ae) { Chris@16: vector_assign (*this, ae); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_column &operator += (const vector_expression &ae) { Chris@16: vector_assign (*this, typename vector_temporary_traits::type (*this + ae)); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_column &plus_assign (const vector_expression &ae) { Chris@16: vector_assign (*this, ae); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_column &operator -= (const vector_expression &ae) { Chris@16: vector_assign (*this, typename vector_temporary_traits::type (*this - ae)); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_column &minus_assign (const vector_expression &ae) { Chris@16: vector_assign (*this, ae); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_column &operator *= (const AT &at) { Chris@16: vector_assign_scalar (*this, at); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_column &operator /= (const AT &at) { Chris@16: vector_assign_scalar (*this, at); Chris@16: return *this; Chris@16: } Chris@16: Chris@16: // Closure comparison Chris@16: BOOST_UBLAS_INLINE Chris@16: bool same_closure (const matrix_column &mc) const { Chris@16: return (*this).data_.same_closure (mc.data_); Chris@16: } Chris@16: Chris@16: // Comparison Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator == (const matrix_column &mc) const { Chris@16: return (*this).data_ == mc.data_ && index () == mc.index (); Chris@16: } Chris@16: Chris@16: // Swapping Chris@16: BOOST_UBLAS_INLINE Chris@16: void swap (matrix_column mc) { Chris@16: if (this != &mc) { Chris@16: BOOST_UBLAS_CHECK (size () == mc.size (), bad_size ()); Chris@16: // Sparse ranges may be nonconformant now. Chris@16: // std::swap_ranges (begin (), end (), mc.begin ()); Chris@16: vector_swap (*this, mc); Chris@16: } Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: friend void swap (matrix_column mc1, matrix_column mc2) { Chris@16: mc1.swap (mc2); Chris@16: } Chris@16: Chris@16: // Iterator types Chris@16: private: Chris@16: typedef typename M::const_iterator1 const_subiterator_type; Chris@16: typedef typename boost::mpl::if_, Chris@16: typename M::const_iterator1, Chris@16: typename M::iterator1>::type subiterator_type; Chris@16: Chris@16: public: Chris@16: #ifdef BOOST_UBLAS_USE_INDEXED_ITERATOR Chris@16: typedef indexed_iterator, Chris@16: typename subiterator_type::iterator_category> iterator; Chris@16: typedef indexed_const_iterator, Chris@16: typename const_subiterator_type::iterator_category> const_iterator; Chris@16: #else Chris@16: class const_iterator; Chris@16: class iterator; Chris@16: #endif Chris@16: Chris@16: // Element lookup Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator find (size_type i) const { Chris@16: const_subiterator_type it1 (data_.find1 (1, i, j_)); Chris@16: #ifdef BOOST_UBLAS_USE_INDEXED_ITERATOR Chris@16: return const_iterator (*this, it1.index1 ()); Chris@16: #else Chris@16: return const_iterator (*this, it1); Chris@16: #endif Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator find (size_type i) { Chris@16: subiterator_type it1 (data_.find1 (1, i, j_)); Chris@16: #ifdef BOOST_UBLAS_USE_INDEXED_ITERATOR Chris@16: return iterator (*this, it1.index1 ()); Chris@16: #else Chris@16: return iterator (*this, it1); Chris@16: #endif Chris@16: } Chris@16: Chris@16: #ifndef BOOST_UBLAS_USE_INDEXED_ITERATOR Chris@16: class const_iterator: Chris@16: public container_const_reference, Chris@16: public iterator_base_traits::template Chris@16: iterator_base::type { Chris@16: public: Chris@16: typedef typename const_subiterator_type::value_type value_type; Chris@16: typedef typename const_subiterator_type::difference_type difference_type; Chris@16: typedef typename const_subiterator_type::reference reference; Chris@16: typedef typename const_subiterator_type::pointer pointer; Chris@16: Chris@16: // Construction and destruction Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator (): Chris@16: container_const_reference (), it_ () {} Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator (const self_type &mc, const const_subiterator_type &it): Chris@16: container_const_reference (mc), it_ (it) {} Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator (const typename self_type::iterator &it): // ISSUE self_type:: stops VC8 using std::iterator here Chris@16: container_const_reference (it ()), it_ (it.it_) {} Chris@16: Chris@16: // Arithmetic Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator &operator ++ () { Chris@16: ++ it_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator &operator -- () { Chris@16: -- it_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator &operator += (difference_type n) { Chris@16: it_ += n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator &operator -= (difference_type n) { Chris@16: it_ -= n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: difference_type operator - (const const_iterator &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return it_ - it.it_; Chris@16: } Chris@16: Chris@16: // Dereference Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator * () const { Chris@16: BOOST_UBLAS_CHECK (index () < (*this) ().size (), bad_index ()); Chris@16: return *it_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator [] (difference_type n) const { Chris@16: return *(*this + n); Chris@16: } Chris@16: Chris@16: // Index Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index () const { Chris@16: return it_.index1 (); Chris@16: } Chris@16: Chris@16: // Assignment Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator &operator = (const const_iterator &it) { Chris@16: container_const_reference::assign (&it ()); Chris@16: it_ = it.it_; Chris@16: return *this; Chris@16: } Chris@16: Chris@16: // Comparison Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator == (const const_iterator &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return it_ == it.it_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator < (const const_iterator &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return it_ < it.it_; Chris@16: } Chris@16: Chris@16: private: Chris@16: const_subiterator_type it_; Chris@16: }; Chris@16: #endif Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator begin () const { Chris@16: return find (0); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@101: const_iterator cbegin () const { Chris@101: return begin (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@16: const_iterator end () const { Chris@16: return find (size ()); Chris@16: } Chris@101: BOOST_UBLAS_INLINE Chris@101: const_iterator cend () const { Chris@101: return end (); Chris@101: } Chris@16: Chris@16: #ifndef BOOST_UBLAS_USE_INDEXED_ITERATOR Chris@16: class iterator: Chris@16: public container_reference, Chris@16: public iterator_base_traits::template Chris@16: iterator_base::type { Chris@16: public: Chris@16: typedef typename subiterator_type::value_type value_type; Chris@16: typedef typename subiterator_type::difference_type difference_type; Chris@16: typedef typename subiterator_type::reference reference; Chris@16: typedef typename subiterator_type::pointer pointer; Chris@16: Chris@16: // Construction and destruction Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator (): Chris@16: container_reference (), it_ () {} Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator (self_type &mc, const subiterator_type &it): Chris@16: container_reference (mc), it_ (it) {} Chris@16: Chris@16: // Arithmetic Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator &operator ++ () { Chris@16: ++ it_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator &operator -- () { Chris@16: -- it_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator &operator += (difference_type n) { Chris@16: it_ += n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator &operator -= (difference_type n) { Chris@16: it_ -= n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: difference_type operator - (const iterator &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return it_ - it.it_; Chris@16: } Chris@16: Chris@16: // Dereference Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator * () const { Chris@16: BOOST_UBLAS_CHECK (index () < (*this) ().size (), bad_index ()); Chris@16: return *it_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator [] (difference_type n) const { Chris@16: return *(*this + n); Chris@16: } Chris@16: Chris@16: // Index Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index () const { Chris@16: return it_.index1 (); Chris@16: } Chris@16: Chris@16: // Assignment Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator &operator = (const iterator &it) { Chris@16: container_reference::assign (&it ()); Chris@16: it_ = it.it_; Chris@16: return *this; Chris@16: } Chris@16: Chris@16: // Comparison Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator == (const iterator &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return it_ == it.it_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator < (const iterator &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return it_ < it.it_; Chris@16: } Chris@16: Chris@16: private: Chris@16: subiterator_type it_; Chris@16: Chris@16: friend class const_iterator; Chris@16: }; Chris@16: #endif Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator begin () { Chris@16: return find (0); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator end () { Chris@16: return find (size ()); Chris@16: } Chris@16: Chris@16: // Reverse iterator Chris@16: typedef reverse_iterator_base const_reverse_iterator; Chris@16: typedef reverse_iterator_base reverse_iterator; Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reverse_iterator rbegin () const { Chris@16: return const_reverse_iterator (end ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@101: const_reverse_iterator crbegin () const { Chris@101: return rbegin (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@16: const_reverse_iterator rend () const { Chris@16: return const_reverse_iterator (begin ()); Chris@16: } Chris@101: BOOST_UBLAS_INLINE Chris@101: const_reverse_iterator crend () const { Chris@101: return rend (); Chris@101: } Chris@16: reverse_iterator rbegin () { Chris@16: return reverse_iterator (end ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reverse_iterator rend () { Chris@16: return reverse_iterator (begin ()); Chris@16: } Chris@16: Chris@16: private: Chris@16: matrix_closure_type data_; Chris@16: size_type j_; Chris@16: }; Chris@16: Chris@16: // Projections Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_column column (M &data, typename M::size_type j) { Chris@16: return matrix_column (data, j); Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: const matrix_column column (const M &data, typename M::size_type j) { Chris@16: return matrix_column (data, j); Chris@16: } Chris@16: Chris@16: // Specialize temporary Chris@16: template Chris@16: struct vector_temporary_traits< matrix_column > Chris@16: : vector_temporary_traits< M > {} ; Chris@16: template Chris@16: struct vector_temporary_traits< const matrix_column > Chris@16: : vector_temporary_traits< M > {} ; Chris@16: Chris@16: // Matrix based vector range class Chris@16: template Chris@16: class matrix_vector_range: Chris@16: public vector_expression > { Chris@16: Chris@16: typedef matrix_vector_range self_type; Chris@16: public: Chris@16: #ifdef BOOST_UBLAS_ENABLE_PROXY_SHORTCUTS Chris@16: using vector_expression::operator (); Chris@16: #endif Chris@16: typedef M matrix_type; Chris@16: typedef typename M::size_type size_type; Chris@16: typedef typename M::difference_type difference_type; Chris@16: typedef typename M::value_type value_type; Chris@16: typedef typename M::const_reference const_reference; Chris@16: typedef typename boost::mpl::if_, Chris@16: typename M::const_reference, Chris@16: typename M::reference>::type reference; Chris@16: typedef typename boost::mpl::if_, Chris@16: typename M::const_closure_type, Chris@16: typename M::closure_type>::type matrix_closure_type; Chris@16: typedef basic_range range_type; Chris@16: typedef const self_type const_closure_type; Chris@16: typedef self_type closure_type; Chris@16: typedef typename storage_restrict_traits::storage_category storage_category; Chris@16: Chris@16: // Construction and destruction Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_vector_range (matrix_type &data, const range_type &r1, const range_type &r2): Chris@16: data_ (data), r1_ (r1.preprocess (data.size1 ())), r2_ (r2.preprocess (data.size2 ())) { Chris@16: // Early checking of preconditions here. Chris@16: // BOOST_UBLAS_CHECK (r1_.start () <= data_.size1 () && Chris@16: // r1_.start () + r1_.size () <= data_.size1 (), bad_index ()); Chris@16: // BOOST_UBLAS_CHECK (r2_.start () <= data_.size2 () && Chris@16: // r2_.start () + r2_.size () <= data_.size2 (), bad_index ()); Chris@16: // BOOST_UBLAS_CHECK (r1_.size () == r2_.size (), bad_size ()); Chris@16: } Chris@16: Chris@16: // Accessors Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type start1 () const { Chris@16: return r1_.start (); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type start2 () const { Chris@16: return r2_.start (); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type size () const { Chris@16: return BOOST_UBLAS_SAME (r1_.size (), r2_.size ()); Chris@16: } Chris@16: Chris@16: // Storage accessors Chris@16: BOOST_UBLAS_INLINE Chris@16: const matrix_closure_type &data () const { Chris@16: return data_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_closure_type &data () { Chris@16: return data_; Chris@16: } Chris@16: Chris@16: // Element access Chris@16: #ifndef BOOST_UBLAS_PROXY_CONST_MEMBER Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator () (size_type i) const { Chris@16: return data_ (r1_ (i), r2_ (i)); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator () (size_type i) { Chris@16: return data_ (r1_ (i), r2_ (i)); Chris@16: } Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator [] (size_type i) const { Chris@16: return (*this) (i); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator [] (size_type i) { Chris@16: return (*this) (i); Chris@16: } Chris@16: #else Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator () (size_type i) const { Chris@16: return data_ (r1_ (i), r2_ (i)); Chris@16: } Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator [] (size_type i) const { Chris@16: return (*this) (i); Chris@16: } Chris@16: #endif Chris@16: Chris@16: // Assignment Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_vector_range &operator = (const matrix_vector_range &mvr) { Chris@16: // ISSUE need a temporary, proxy can be overlaping alias Chris@16: vector_assign (*this, typename vector_temporary_traits::type (mvr)); Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_vector_range &assign_temporary (matrix_vector_range &mvr) { Chris@16: // assign elements, proxied container remains the same Chris@16: vector_assign (*this, mvr); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_vector_range &operator = (const vector_expression &ae) { Chris@16: vector_assign (*this, typename vector_temporary_traits::type (ae)); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_vector_range &assign (const vector_expression &ae) { Chris@16: vector_assign (*this, ae); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_vector_range &operator += (const vector_expression &ae) { Chris@16: vector_assign (*this, typename vector_temporary_traits::type (*this + ae)); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_vector_range &plus_assign (const vector_expression &ae) { Chris@16: vector_assign (*this, ae); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_vector_range &operator -= (const vector_expression &ae) { Chris@16: vector_assign (*this, typename vector_temporary_traits::type (*this - ae)); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_vector_range &minus_assign (const vector_expression &ae) { Chris@16: vector_assign (*this, ae); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_vector_range &operator *= (const AT &at) { Chris@16: vector_assign_scalar (*this, at); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_vector_range &operator /= (const AT &at) { Chris@16: vector_assign_scalar (*this, at); Chris@16: return *this; Chris@16: } Chris@16: Chris@16: // Closure comparison Chris@16: BOOST_UBLAS_INLINE Chris@16: bool same_closure (const matrix_vector_range &mvr) const { Chris@16: return (*this).data_.same_closure (mvr.data_); Chris@16: } Chris@16: Chris@16: // Comparison Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator == (const matrix_vector_range &mvr) const { Chris@16: return (*this).data_ == mvr.data_ && r1_ == mvr.r1_ && r2_ == mvr.r2_; Chris@16: } Chris@16: Chris@16: // Swapping Chris@16: BOOST_UBLAS_INLINE Chris@16: void swap (matrix_vector_range mvr) { Chris@16: if (this != &mvr) { Chris@16: BOOST_UBLAS_CHECK (size () == mvr.size (), bad_size ()); Chris@16: // Sparse ranges may be nonconformant now. Chris@16: // std::swap_ranges (begin (), end (), mvr.begin ()); Chris@16: vector_swap (*this, mvr); Chris@16: } Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: friend void swap (matrix_vector_range mvr1, matrix_vector_range mvr2) { Chris@16: mvr1.swap (mvr2); Chris@16: } Chris@16: Chris@16: // Iterator types Chris@16: private: Chris@16: // Use range as an index - FIXME this fails for packed assignment Chris@16: typedef typename range_type::const_iterator const_subiterator1_type; Chris@16: typedef typename range_type::const_iterator subiterator1_type; Chris@16: typedef typename range_type::const_iterator const_subiterator2_type; Chris@16: typedef typename range_type::const_iterator subiterator2_type; Chris@16: Chris@16: public: Chris@16: class const_iterator; Chris@16: class iterator; Chris@16: Chris@16: // Element lookup Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator find (size_type i) const { Chris@16: return const_iterator (*this, r1_.begin () + i, r2_.begin () + i); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator find (size_type i) { Chris@16: return iterator (*this, r1_.begin () + i, r2_.begin () + i); Chris@16: } Chris@16: Chris@16: class const_iterator: Chris@16: public container_const_reference, Chris@16: public iterator_base_traits::template Chris@16: iterator_base::type { Chris@16: public: Chris@16: // FIXME Iterator can never be different code was: Chris@16: // typename iterator_restrict_traits::iterator_category> Chris@16: BOOST_STATIC_ASSERT ((boost::is_same::value )); Chris@16: Chris@16: typedef typename matrix_vector_range::value_type value_type; Chris@16: typedef typename matrix_vector_range::difference_type difference_type; Chris@16: typedef typename matrix_vector_range::const_reference reference; Chris@16: typedef const typename matrix_vector_range::value_type *pointer; Chris@16: Chris@16: // Construction and destruction Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator (): Chris@16: container_const_reference (), it1_ (), it2_ () {} Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator (const self_type &mvr, const const_subiterator1_type &it1, const const_subiterator2_type &it2): Chris@16: container_const_reference (mvr), it1_ (it1), it2_ (it2) {} Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator (const typename self_type::iterator &it): // ISSUE self_type:: stops VC8 using std::iterator here Chris@16: container_const_reference (it ()), it1_ (it.it1_), it2_ (it.it2_) {} Chris@16: Chris@16: // Arithmetic Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator &operator ++ () { Chris@16: ++ it1_; Chris@16: ++ it2_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator &operator -- () { Chris@16: -- it1_; Chris@16: -- it2_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator &operator += (difference_type n) { Chris@16: it1_ += n; Chris@16: it2_ += n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator &operator -= (difference_type n) { Chris@16: it1_ -= n; Chris@16: it2_ -= n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: difference_type operator - (const const_iterator &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return BOOST_UBLAS_SAME (it1_ - it.it1_, it2_ - it.it2_); Chris@16: } Chris@16: Chris@16: // Dereference Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator * () const { Chris@16: // FIXME replace find with at_element Chris@16: return (*this) ().data_ (*it1_, *it2_); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator [] (difference_type n) const { Chris@16: return *(*this + n); Chris@16: } Chris@16: Chris@16: // Index Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index () const { Chris@16: return BOOST_UBLAS_SAME (it1_.index (), it2_.index ()); Chris@16: } Chris@16: Chris@16: // Assignment Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator &operator = (const const_iterator &it) { Chris@16: container_const_reference::assign (&it ()); Chris@16: it1_ = it.it1_; Chris@16: it2_ = it.it2_; Chris@16: return *this; Chris@16: } Chris@16: Chris@16: // Comparison Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator == (const const_iterator &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return it1_ == it.it1_ && it2_ == it.it2_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator < (const const_iterator &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return it1_ < it.it1_ && it2_ < it.it2_; Chris@16: } Chris@16: Chris@16: private: Chris@16: const_subiterator1_type it1_; Chris@16: const_subiterator2_type it2_; Chris@16: }; Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator begin () const { Chris@16: return find (0); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@101: const_iterator cbegin () const { Chris@101: return begin (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@16: const_iterator end () const { Chris@16: return find (size ()); Chris@16: } Chris@101: BOOST_UBLAS_INLINE Chris@101: const_iterator cend () const { Chris@101: return end (); Chris@101: } Chris@16: Chris@16: class iterator: Chris@16: public container_reference, Chris@16: public iterator_base_traits::template Chris@16: iterator_base::type { Chris@16: public: Chris@16: // FIXME Iterator can never be different code was: Chris@16: // typename iterator_restrict_traits::iterator_category> Chris@16: BOOST_STATIC_ASSERT ((boost::is_same::value )); Chris@16: Chris@16: typedef typename matrix_vector_range::value_type value_type; Chris@16: typedef typename matrix_vector_range::difference_type difference_type; Chris@16: typedef typename matrix_vector_range::reference reference; Chris@16: typedef typename matrix_vector_range::value_type *pointer; Chris@16: Chris@16: // Construction and destruction Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator (): Chris@16: container_reference (), it1_ (), it2_ () {} Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator (self_type &mvr, const subiterator1_type &it1, const subiterator2_type &it2): Chris@16: container_reference (mvr), it1_ (it1), it2_ (it2) {} Chris@16: Chris@16: // Arithmetic Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator &operator ++ () { Chris@16: ++ it1_; Chris@16: ++ it2_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator &operator -- () { Chris@16: -- it1_; Chris@16: -- it2_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator &operator += (difference_type n) { Chris@16: it1_ += n; Chris@16: it2_ += n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator &operator -= (difference_type n) { Chris@16: it1_ -= n; Chris@16: it2_ -= n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: difference_type operator - (const iterator &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return BOOST_UBLAS_SAME (it1_ - it.it1_, it2_ - it.it2_); Chris@16: } Chris@16: Chris@16: // Dereference Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator * () const { Chris@16: // FIXME replace find with at_element Chris@16: return (*this) ().data_ (*it1_, *it2_); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator [] (difference_type n) const { Chris@16: return *(*this + n); Chris@16: } Chris@16: Chris@16: // Index Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index () const { Chris@16: return BOOST_UBLAS_SAME (it1_.index (), it2_.index ()); Chris@16: } Chris@16: Chris@16: // Assignment Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator &operator = (const iterator &it) { Chris@16: container_reference::assign (&it ()); Chris@16: it1_ = it.it1_; Chris@16: it2_ = it.it2_; Chris@16: return *this; Chris@16: } Chris@16: Chris@16: // Comparison Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator == (const iterator &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return it1_ == it.it1_ && it2_ == it.it2_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator < (const iterator &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return it1_ < it.it1_ && it2_ < it.it2_; Chris@16: } Chris@16: Chris@16: private: Chris@16: subiterator1_type it1_; Chris@16: subiterator2_type it2_; Chris@16: Chris@16: friend class const_iterator; Chris@16: }; Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator begin () { Chris@16: return find (0); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator end () { Chris@16: return find (size ()); Chris@16: } Chris@16: Chris@16: // Reverse iterator Chris@16: typedef reverse_iterator_base const_reverse_iterator; Chris@16: typedef reverse_iterator_base reverse_iterator; Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reverse_iterator rbegin () const { Chris@16: return const_reverse_iterator (end ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@101: const_reverse_iterator crbegin () const { Chris@101: return rbegin (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@16: const_reverse_iterator rend () const { Chris@16: return const_reverse_iterator (begin ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@101: const_reverse_iterator crend () const { Chris@101: return rend (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@16: reverse_iterator rbegin () { Chris@16: return reverse_iterator (end ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reverse_iterator rend () { Chris@16: return reverse_iterator (begin ()); Chris@16: } Chris@16: Chris@16: private: Chris@16: matrix_closure_type data_; Chris@16: range_type r1_; Chris@16: range_type r2_; Chris@16: }; Chris@16: Chris@16: // Specialize temporary Chris@16: template Chris@16: struct vector_temporary_traits< matrix_vector_range > Chris@16: : vector_temporary_traits< M > {} ; Chris@16: template Chris@16: struct vector_temporary_traits< const matrix_vector_range > Chris@16: : vector_temporary_traits< M > {} ; Chris@16: Chris@16: // Matrix based vector slice class Chris@16: template Chris@16: class matrix_vector_slice: Chris@16: public vector_expression > { Chris@16: Chris@16: typedef matrix_vector_slice self_type; Chris@16: public: Chris@16: #ifdef BOOST_UBLAS_ENABLE_PROXY_SHORTCUTS Chris@16: using vector_expression::operator (); Chris@16: #endif Chris@16: typedef M matrix_type; Chris@16: typedef typename M::size_type size_type; Chris@16: typedef typename M::difference_type difference_type; Chris@16: typedef typename M::value_type value_type; Chris@16: typedef typename M::const_reference const_reference; Chris@16: typedef typename boost::mpl::if_, Chris@16: typename M::const_reference, Chris@16: typename M::reference>::type reference; Chris@16: typedef typename boost::mpl::if_, Chris@16: typename M::const_closure_type, Chris@16: typename M::closure_type>::type matrix_closure_type; Chris@16: typedef basic_range range_type; Chris@16: typedef basic_slice slice_type; Chris@16: typedef const self_type const_closure_type; Chris@16: typedef self_type closure_type; Chris@16: typedef typename storage_restrict_traits::storage_category storage_category; Chris@16: Chris@16: // Construction and destruction Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_vector_slice (matrix_type &data, const slice_type &s1, const slice_type &s2): Chris@16: data_ (data), s1_ (s1.preprocess (data.size1 ())), s2_ (s2.preprocess (data.size2 ())) { Chris@16: // Early checking of preconditions here. Chris@16: // BOOST_UBLAS_CHECK (s1_.start () <= data_.size1 () && Chris@16: // s1_.start () + s1_.stride () * (s1_.size () - (s1_.size () > 0)) <= data_.size1 (), bad_index ()); Chris@16: // BOOST_UBLAS_CHECK (s2_.start () <= data_.size2 () && Chris@16: // s2_.start () + s2_.stride () * (s2_.size () - (s2_.size () > 0)) <= data_.size2 (), bad_index ()); Chris@16: } Chris@16: Chris@16: // Accessors Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type start1 () const { Chris@16: return s1_.start (); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type start2 () const { Chris@16: return s2_.start (); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: difference_type stride1 () const { Chris@16: return s1_.stride (); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: difference_type stride2 () const { Chris@16: return s2_.stride (); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type size () const { Chris@16: return BOOST_UBLAS_SAME (s1_.size (), s2_.size ()); Chris@16: } Chris@16: Chris@16: // Storage accessors Chris@16: BOOST_UBLAS_INLINE Chris@16: const matrix_closure_type &data () const { Chris@16: return data_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_closure_type &data () { Chris@16: return data_; Chris@16: } Chris@16: Chris@16: // Element access Chris@16: #ifndef BOOST_UBLAS_PROXY_CONST_MEMBER Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator () (size_type i) const { Chris@16: return data_ (s1_ (i), s2_ (i)); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator () (size_type i) { Chris@16: return data_ (s1_ (i), s2_ (i)); Chris@16: } Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator [] (size_type i) const { Chris@16: return (*this) (i); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator [] (size_type i) { Chris@16: return (*this) (i); Chris@16: } Chris@16: #else Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator () (size_type i) const { Chris@16: return data_ (s1_ (i), s2_ (i)); Chris@16: } Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator [] (size_type i) const { Chris@16: return (*this) (i); Chris@16: } Chris@16: #endif Chris@16: Chris@16: // Assignment Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_vector_slice &operator = (const matrix_vector_slice &mvs) { Chris@16: // ISSUE need a temporary, proxy can be overlaping alias Chris@16: vector_assign (*this, typename vector_temporary_traits::type (mvs)); Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_vector_slice &assign_temporary (matrix_vector_slice &mvs) { Chris@16: // assign elements, proxied container remains the same Chris@16: vector_assign (*this, mvs); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_vector_slice &operator = (const vector_expression &ae) { Chris@16: vector_assign (*this, typename vector_temporary_traits::type (ae)); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_vector_slice &assign (const vector_expression &ae) { Chris@16: vector_assign (*this, ae); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_vector_slice &operator += (const vector_expression &ae) { Chris@16: vector_assign (*this, typename vector_temporary_traits::type (*this + ae)); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_vector_slice &plus_assign (const vector_expression &ae) { Chris@16: vector_assign (*this, ae); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_vector_slice &operator -= (const vector_expression &ae) { Chris@16: vector_assign (*this, typename vector_temporary_traits::type (*this - ae)); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_vector_slice &minus_assign (const vector_expression &ae) { Chris@16: vector_assign (*this, ae); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_vector_slice &operator *= (const AT &at) { Chris@16: vector_assign_scalar (*this, at); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_vector_slice &operator /= (const AT &at) { Chris@16: vector_assign_scalar (*this, at); Chris@16: return *this; Chris@16: } Chris@16: Chris@16: // Closure comparison Chris@16: BOOST_UBLAS_INLINE Chris@16: bool same_closure (const matrix_vector_slice &mvs) const { Chris@16: return (*this).data_.same_closure (mvs.data_); Chris@16: } Chris@16: Chris@16: // Comparison Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator == (const matrix_vector_slice &mvs) const { Chris@16: return (*this).data_ == mvs.data_ && s1_ == mvs.s1_ && s2_ == mvs.s2_; Chris@16: } Chris@16: Chris@16: // Swapping Chris@16: BOOST_UBLAS_INLINE Chris@16: void swap (matrix_vector_slice mvs) { Chris@16: if (this != &mvs) { Chris@16: BOOST_UBLAS_CHECK (size () == mvs.size (), bad_size ()); Chris@16: // Sparse ranges may be nonconformant now. Chris@16: // std::swap_ranges (begin (), end (), mvs.begin ()); Chris@16: vector_swap (*this, mvs); Chris@16: } Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: friend void swap (matrix_vector_slice mvs1, matrix_vector_slice mvs2) { Chris@16: mvs1.swap (mvs2); Chris@16: } Chris@16: Chris@16: // Iterator types Chris@16: private: Chris@16: // Use slice as an index - FIXME this fails for packed assignment Chris@16: typedef typename slice_type::const_iterator const_subiterator1_type; Chris@16: typedef typename slice_type::const_iterator subiterator1_type; Chris@16: typedef typename slice_type::const_iterator const_subiterator2_type; Chris@16: typedef typename slice_type::const_iterator subiterator2_type; Chris@16: Chris@16: public: Chris@16: class const_iterator; Chris@16: class iterator; Chris@16: Chris@16: // Element lookup Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator find (size_type i) const { Chris@16: return const_iterator (*this, s1_.begin () + i, s2_.begin () + i); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator find (size_type i) { Chris@16: return iterator (*this, s1_.begin () + i, s2_.begin () + i); Chris@16: } Chris@16: Chris@16: // Iterators simply are indices. Chris@16: Chris@16: class const_iterator: Chris@16: public container_const_reference, Chris@16: public iterator_base_traits::template Chris@16: iterator_base::type { Chris@16: public: Chris@16: // FIXME Iterator can never be different code was: Chris@16: // typename iterator_restrict_traits::iterator_category> Chris@16: BOOST_STATIC_ASSERT ((boost::is_same::value )); Chris@16: Chris@16: typedef typename matrix_vector_slice::value_type value_type; Chris@16: typedef typename matrix_vector_slice::difference_type difference_type; Chris@16: typedef typename matrix_vector_slice::const_reference reference; Chris@16: typedef const typename matrix_vector_slice::value_type *pointer; Chris@16: Chris@16: // Construction and destruction Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator (): Chris@16: container_const_reference (), it1_ (), it2_ () {} Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator (const self_type &mvs, const const_subiterator1_type &it1, const const_subiterator2_type &it2): Chris@16: container_const_reference (mvs), it1_ (it1), it2_ (it2) {} Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator (const typename self_type::iterator &it): // ISSUE vector:: stops VC8 using std::iterator here Chris@16: container_const_reference (it ()), it1_ (it.it1_), it2_ (it.it2_) {} Chris@16: Chris@16: // Arithmetic Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator &operator ++ () { Chris@16: ++ it1_; Chris@16: ++ it2_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator &operator -- () { Chris@16: -- it1_; Chris@16: -- it2_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator &operator += (difference_type n) { Chris@16: it1_ += n; Chris@16: it2_ += n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator &operator -= (difference_type n) { Chris@16: it1_ -= n; Chris@16: it2_ -= n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: difference_type operator - (const const_iterator &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return BOOST_UBLAS_SAME (it1_ - it.it1_, it2_ - it.it2_); Chris@16: } Chris@16: Chris@16: // Dereference Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator * () const { Chris@16: // FIXME replace find with at_element Chris@16: return (*this) ().data_ (*it1_, *it2_); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator [] (difference_type n) const { Chris@16: return *(*this + n); Chris@16: } Chris@16: Chris@16: // Index Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index () const { Chris@16: return BOOST_UBLAS_SAME (it1_.index (), it2_.index ()); Chris@16: } Chris@16: Chris@16: // Assignment Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator &operator = (const const_iterator &it) { Chris@16: container_const_reference::assign (&it ()); Chris@16: it1_ = it.it1_; Chris@16: it2_ = it.it2_; Chris@16: return *this; Chris@16: } Chris@16: Chris@16: // Comparison Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator == (const const_iterator &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return it1_ == it.it1_ && it2_ == it.it2_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator < (const const_iterator &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return it1_ < it.it1_ && it2_ < it.it2_; Chris@16: } Chris@16: Chris@16: private: Chris@16: const_subiterator1_type it1_; Chris@16: const_subiterator2_type it2_; Chris@16: }; Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator begin () const { Chris@16: return find (0); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@101: const_iterator cbegin () const { Chris@101: return begin (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@16: const_iterator end () const { Chris@16: return find (size ()); Chris@16: } Chris@101: BOOST_UBLAS_INLINE Chris@101: const_iterator cend () const { Chris@101: return end (); Chris@101: } Chris@16: Chris@16: class iterator: Chris@16: public container_reference, Chris@16: public iterator_base_traits::template Chris@16: iterator_base::type { Chris@16: public: Chris@16: // FIXME Iterator can never be different code was: Chris@16: // typename iterator_restrict_traits::iterator_category> Chris@16: BOOST_STATIC_ASSERT ((boost::is_same::value )); Chris@16: Chris@16: typedef typename matrix_vector_slice::value_type value_type; Chris@16: typedef typename matrix_vector_slice::difference_type difference_type; Chris@16: typedef typename matrix_vector_slice::reference reference; Chris@16: typedef typename matrix_vector_slice::value_type *pointer; Chris@16: Chris@16: // Construction and destruction Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator (): Chris@16: container_reference (), it1_ (), it2_ () {} Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator (self_type &mvs, const subiterator1_type &it1, const subiterator2_type &it2): Chris@16: container_reference (mvs), it1_ (it1), it2_ (it2) {} Chris@16: Chris@16: // Arithmetic Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator &operator ++ () { Chris@16: ++ it1_; Chris@16: ++ it2_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator &operator -- () { Chris@16: -- it1_; Chris@16: -- it2_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator &operator += (difference_type n) { Chris@16: it1_ += n; Chris@16: it2_ += n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator &operator -= (difference_type n) { Chris@16: it1_ -= n; Chris@16: it2_ -= n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: difference_type operator - (const iterator &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return BOOST_UBLAS_SAME (it1_ - it.it1_, it2_ - it.it2_); Chris@16: } Chris@16: Chris@16: // Dereference Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator * () const { Chris@16: // FIXME replace find with at_element Chris@16: return (*this) ().data_ (*it1_, *it2_); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator [] (difference_type n) const { Chris@16: return *(*this + n); Chris@16: } Chris@16: Chris@16: // Index Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index () const { Chris@16: return BOOST_UBLAS_SAME (it1_.index (), it2_.index ()); Chris@16: } Chris@16: Chris@16: // Assignment Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator &operator = (const iterator &it) { Chris@16: container_reference::assign (&it ()); Chris@16: it1_ = it.it1_; Chris@16: it2_ = it.it2_; Chris@16: return *this; Chris@16: } Chris@16: Chris@16: // Comparison Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator == (const iterator &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return it1_ == it.it1_ && it2_ == it.it2_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator < (const iterator &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return it1_ < it.it1_ && it2_ < it.it2_; Chris@16: } Chris@16: Chris@16: private: Chris@16: subiterator1_type it1_; Chris@16: subiterator2_type it2_; Chris@16: Chris@16: friend class const_iterator; Chris@16: }; Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator begin () { Chris@16: return find (0); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator end () { Chris@16: return find (size ()); Chris@16: } Chris@16: Chris@16: // Reverse iterator Chris@16: typedef reverse_iterator_base const_reverse_iterator; Chris@16: typedef reverse_iterator_base reverse_iterator; Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reverse_iterator rbegin () const { Chris@16: return const_reverse_iterator (end ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@101: const_reverse_iterator crbegin () const { Chris@101: return rbegin (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@16: const_reverse_iterator rend () const { Chris@16: return const_reverse_iterator (begin ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@101: const_reverse_iterator crend () const { Chris@101: return rend (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@16: reverse_iterator rbegin () { Chris@16: return reverse_iterator (end ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reverse_iterator rend () { Chris@16: return reverse_iterator (begin ()); Chris@16: } Chris@16: Chris@16: private: Chris@16: matrix_closure_type data_; Chris@16: slice_type s1_; Chris@16: slice_type s2_; Chris@16: }; Chris@16: Chris@16: // Specialize temporary Chris@16: template Chris@16: struct vector_temporary_traits< matrix_vector_slice > Chris@16: : vector_temporary_traits< M > {} ; Chris@16: template Chris@16: struct vector_temporary_traits< const matrix_vector_slice > Chris@16: : vector_temporary_traits< M > {} ; Chris@16: Chris@16: // Matrix based vector indirection class Chris@16: Chris@16: template Chris@16: class matrix_vector_indirect: Chris@16: public vector_expression > { Chris@16: Chris@16: typedef matrix_vector_indirect self_type; Chris@16: public: Chris@16: #ifdef BOOST_UBLAS_ENABLE_PROXY_SHORTCUTS Chris@16: using vector_expression::operator (); Chris@16: #endif Chris@16: typedef M matrix_type; Chris@16: typedef IA indirect_array_type; Chris@16: typedef typename M::size_type size_type; Chris@16: typedef typename M::difference_type difference_type; Chris@16: typedef typename M::value_type value_type; Chris@16: typedef typename M::const_reference const_reference; Chris@16: typedef typename boost::mpl::if_, Chris@16: typename M::const_reference, Chris@16: typename M::reference>::type reference; Chris@16: typedef typename boost::mpl::if_, Chris@16: typename M::const_closure_type, Chris@16: typename M::closure_type>::type matrix_closure_type; Chris@16: typedef const self_type const_closure_type; Chris@16: typedef self_type closure_type; Chris@16: typedef typename storage_restrict_traits::storage_category storage_category; Chris@16: Chris@16: // Construction and destruction Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_vector_indirect (matrix_type &data, size_type size): Chris@16: data_ (data), ia1_ (size), ia2_ (size) {} Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_vector_indirect (matrix_type &data, const indirect_array_type &ia1, const indirect_array_type &ia2): Chris@16: data_ (data), ia1_ (ia1), ia2_ (ia2) { Chris@16: // Early checking of preconditions here. Chris@16: // BOOST_UBLAS_CHECK (ia1_.size () == ia2_.size (), bad_size ()); Chris@16: } Chris@16: Chris@16: // Accessors Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type size () const { Chris@16: return BOOST_UBLAS_SAME (ia1_.size (), ia2_.size ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const indirect_array_type &indirect1 () const { Chris@16: return ia1_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: indirect_array_type &indirect1 () { Chris@16: return ia1_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const indirect_array_type &indirect2 () const { Chris@16: return ia2_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: indirect_array_type &indirect2 () { Chris@16: return ia2_; Chris@16: } Chris@16: Chris@16: // Storage accessors Chris@16: BOOST_UBLAS_INLINE Chris@16: const matrix_closure_type &data () const { Chris@16: return data_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_closure_type &data () { Chris@16: return data_; Chris@16: } Chris@16: Chris@16: // Element access Chris@16: #ifndef BOOST_UBLAS_PROXY_CONST_MEMBER Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator () (size_type i) const { Chris@16: return data_ (ia1_ (i), ia2_ (i)); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator () (size_type i) { Chris@16: return data_ (ia1_ (i), ia2_ (i)); Chris@16: } Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator [] (size_type i) const { Chris@16: return (*this) (i); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator [] (size_type i) { Chris@16: return (*this) (i); Chris@16: } Chris@16: #else Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator () (size_type i) const { Chris@16: return data_ (ia1_ (i), ia2_ (i)); Chris@16: } Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator [] (size_type i) const { Chris@16: return (*this) (i); Chris@16: } Chris@16: #endif Chris@16: Chris@16: // Assignment Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_vector_indirect &operator = (const matrix_vector_indirect &mvi) { Chris@16: // ISSUE need a temporary, proxy can be overlaping alias Chris@16: vector_assign (*this, typename vector_temporary_traits::type (mvi)); Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_vector_indirect &assign_temporary (matrix_vector_indirect &mvi) { Chris@16: // assign elements, proxied container remains the same Chris@16: vector_assign (*this, mvi); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_vector_indirect &operator = (const vector_expression &ae) { Chris@16: vector_assign (*this, typename vector_temporary_traits::type (ae)); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_vector_indirect &assign (const vector_expression &ae) { Chris@16: vector_assign (*this, ae); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_vector_indirect &operator += (const vector_expression &ae) { Chris@16: vector_assign (*this, typename vector_temporary_traits::type (*this + ae)); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_vector_indirect &plus_assign (const vector_expression &ae) { Chris@16: vector_assign (*this, ae); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_vector_indirect &operator -= (const vector_expression &ae) { Chris@16: vector_assign (*this, typename vector_temporary_traits::type (*this - ae)); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_vector_indirect &minus_assign (const vector_expression &ae) { Chris@16: vector_assign (*this, ae); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_vector_indirect &operator *= (const AT &at) { Chris@16: vector_assign_scalar (*this, at); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_vector_indirect &operator /= (const AT &at) { Chris@16: vector_assign_scalar (*this, at); Chris@16: return *this; Chris@16: } Chris@16: Chris@16: // Closure comparison Chris@16: BOOST_UBLAS_INLINE Chris@16: bool same_closure (const matrix_vector_indirect &mvi) const { Chris@16: return (*this).data_.same_closure (mvi.data_); Chris@16: } Chris@16: Chris@16: // Comparison Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator == (const matrix_vector_indirect &mvi) const { Chris@16: return (*this).data_ == mvi.data_ && ia1_ == mvi.ia1_ && ia2_ == mvi.ia2_; Chris@16: } Chris@16: Chris@16: // Swapping Chris@16: BOOST_UBLAS_INLINE Chris@16: void swap (matrix_vector_indirect mvi) { Chris@16: if (this != &mvi) { Chris@16: BOOST_UBLAS_CHECK (size () == mvi.size (), bad_size ()); Chris@16: // Sparse ranges may be nonconformant now. Chris@16: // std::swap_ranges (begin (), end (), mvi.begin ()); Chris@16: vector_swap (*this, mvi); Chris@16: } Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: friend void swap (matrix_vector_indirect mvi1, matrix_vector_indirect mvi2) { Chris@16: mvi1.swap (mvi2); Chris@16: } Chris@16: Chris@16: // Iterator types Chris@16: private: Chris@16: // Use indirect array as an index - FIXME this fails for packed assignment Chris@16: typedef typename IA::const_iterator const_subiterator1_type; Chris@16: typedef typename IA::const_iterator subiterator1_type; Chris@16: typedef typename IA::const_iterator const_subiterator2_type; Chris@16: typedef typename IA::const_iterator subiterator2_type; Chris@16: Chris@16: public: Chris@16: class const_iterator; Chris@16: class iterator; Chris@16: Chris@16: // Element lookup Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator find (size_type i) const { Chris@16: return const_iterator (*this, ia1_.begin () + i, ia2_.begin () + i); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator find (size_type i) { Chris@16: return iterator (*this, ia1_.begin () + i, ia2_.begin () + i); Chris@16: } Chris@16: Chris@16: // Iterators simply are indices. Chris@16: Chris@16: class const_iterator: Chris@16: public container_const_reference, Chris@16: public iterator_base_traits::template Chris@16: iterator_base::type { Chris@16: public: Chris@16: // FIXME Iterator can never be different code was: Chris@16: // typename iterator_restrict_traits::iterator_category> Chris@16: BOOST_STATIC_ASSERT ((boost::is_same::value )); Chris@16: Chris@16: typedef typename matrix_vector_indirect::value_type value_type; Chris@16: typedef typename matrix_vector_indirect::difference_type difference_type; Chris@16: typedef typename matrix_vector_indirect::const_reference reference; Chris@16: typedef const typename matrix_vector_indirect::value_type *pointer; Chris@16: Chris@16: // Construction and destruction Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator (): Chris@16: container_const_reference (), it1_ (), it2_ () {} Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator (const self_type &mvi, const const_subiterator1_type &it1, const const_subiterator2_type &it2): Chris@16: container_const_reference (mvi), it1_ (it1), it2_ (it2) {} Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator (const typename self_type::iterator &it): // ISSUE self_type:: stops VC8 using std::iterator here Chris@16: container_const_reference (it ()), it1_ (it.it1_), it2_ (it.it2_) {} Chris@16: Chris@16: // Arithmetic Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator &operator ++ () { Chris@16: ++ it1_; Chris@16: ++ it2_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator &operator -- () { Chris@16: -- it1_; Chris@16: -- it2_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator &operator += (difference_type n) { Chris@16: it1_ += n; Chris@16: it2_ += n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator &operator -= (difference_type n) { Chris@16: it1_ -= n; Chris@16: it2_ -= n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: difference_type operator - (const const_iterator &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return BOOST_UBLAS_SAME (it1_ - it.it1_, it2_ - it.it2_); Chris@16: } Chris@16: Chris@16: // Dereference Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator * () const { Chris@16: // FIXME replace find with at_element Chris@16: return (*this) ().data_ (*it1_, *it2_); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator [] (difference_type n) const { Chris@16: return *(*this + n); Chris@16: } Chris@16: Chris@16: // Index Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index () const { Chris@16: return BOOST_UBLAS_SAME (it1_.index (), it2_.index ()); Chris@16: } Chris@16: Chris@16: // Assignment Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator &operator = (const const_iterator &it) { Chris@16: container_const_reference::assign (&it ()); Chris@16: it1_ = it.it1_; Chris@16: it2_ = it.it2_; Chris@16: return *this; Chris@16: } Chris@16: Chris@16: // Comparison Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator == (const const_iterator &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return it1_ == it.it1_ && it2_ == it.it2_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator < (const const_iterator &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return it1_ < it.it1_ && it2_ < it.it2_; Chris@16: } Chris@16: Chris@16: private: Chris@16: const_subiterator1_type it1_; Chris@16: const_subiterator2_type it2_; Chris@16: }; Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator begin () const { Chris@16: return find (0); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@101: const_iterator cbegin () const { Chris@101: return begin (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@16: const_iterator end () const { Chris@16: return find (size ()); Chris@16: } Chris@101: BOOST_UBLAS_INLINE Chris@101: const_iterator cend () const { Chris@101: return end (); Chris@101: } Chris@16: Chris@16: class iterator: Chris@16: public container_reference, Chris@16: public iterator_base_traits::template Chris@16: iterator_base::type { Chris@16: public: Chris@16: // FIXME Iterator can never be different code was: Chris@16: // typename iterator_restrict_traits::iterator_category> Chris@16: BOOST_STATIC_ASSERT ((boost::is_same::value )); Chris@16: Chris@16: typedef typename matrix_vector_indirect::value_type value_type; Chris@16: typedef typename matrix_vector_indirect::difference_type difference_type; Chris@16: typedef typename matrix_vector_indirect::reference reference; Chris@16: typedef typename matrix_vector_indirect::value_type *pointer; Chris@16: Chris@16: // Construction and destruction Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator (): Chris@16: container_reference (), it1_ (), it2_ () {} Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator (self_type &mvi, const subiterator1_type &it1, const subiterator2_type &it2): Chris@16: container_reference (mvi), it1_ (it1), it2_ (it2) {} Chris@16: Chris@16: // Arithmetic Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator &operator ++ () { Chris@16: ++ it1_; Chris@16: ++ it2_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator &operator -- () { Chris@16: -- it1_; Chris@16: -- it2_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator &operator += (difference_type n) { Chris@16: it1_ += n; Chris@16: it2_ += n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator &operator -= (difference_type n) { Chris@16: it1_ -= n; Chris@16: it2_ -= n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: difference_type operator - (const iterator &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return BOOST_UBLAS_SAME (it1_ - it.it1_, it2_ - it.it2_); Chris@16: } Chris@16: Chris@16: // Dereference Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator * () const { Chris@16: // FIXME replace find with at_element Chris@16: return (*this) ().data_ (*it1_, *it2_); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator [] (difference_type n) const { Chris@16: return *(*this + n); Chris@16: } Chris@16: Chris@16: // Index Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index () const { Chris@16: return BOOST_UBLAS_SAME (it1_.index (), it2_.index ()); Chris@16: } Chris@16: Chris@16: // Assignment Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator &operator = (const iterator &it) { Chris@16: container_reference::assign (&it ()); Chris@16: it1_ = it.it1_; Chris@16: it2_ = it.it2_; Chris@16: return *this; Chris@16: } Chris@16: Chris@16: // Comparison Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator == (const iterator &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return it1_ == it.it1_ && it2_ == it.it2_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator < (const iterator &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return it1_ < it.it1_ && it2_ < it.it2_; Chris@16: } Chris@16: Chris@16: private: Chris@16: subiterator1_type it1_; Chris@16: subiterator2_type it2_; Chris@16: Chris@16: friend class const_iterator; Chris@16: }; Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator begin () { Chris@16: return find (0); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator end () { Chris@16: return find (size ()); Chris@16: } Chris@16: Chris@16: // Reverse iterator Chris@16: typedef reverse_iterator_base const_reverse_iterator; Chris@16: typedef reverse_iterator_base reverse_iterator; Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reverse_iterator rbegin () const { Chris@16: return const_reverse_iterator (end ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@101: const_reverse_iterator crbegin () const { Chris@101: return rbegin (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@16: const_reverse_iterator rend () const { Chris@16: return const_reverse_iterator (begin ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@101: const_reverse_iterator crend () const { Chris@101: return rend (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@16: reverse_iterator rbegin () { Chris@16: return reverse_iterator (end ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reverse_iterator rend () { Chris@16: return reverse_iterator (begin ()); Chris@16: } Chris@16: Chris@16: private: Chris@16: matrix_closure_type data_; Chris@16: indirect_array_type ia1_; Chris@16: indirect_array_type ia2_; Chris@16: }; Chris@16: Chris@16: // Specialize temporary Chris@16: template Chris@16: struct vector_temporary_traits< matrix_vector_indirect > Chris@16: : vector_temporary_traits< M > {} ; Chris@16: template Chris@16: struct vector_temporary_traits< const matrix_vector_indirect > Chris@16: : vector_temporary_traits< M > {} ; Chris@16: Chris@16: // Matrix based range class Chris@16: template Chris@16: class matrix_range: Chris@16: public matrix_expression > { Chris@16: Chris@16: typedef matrix_range self_type; Chris@16: public: Chris@16: #ifdef BOOST_UBLAS_ENABLE_PROXY_SHORTCUTS Chris@16: using matrix_expression::operator (); Chris@16: #endif Chris@16: typedef M matrix_type; Chris@16: typedef typename M::size_type size_type; Chris@16: typedef typename M::difference_type difference_type; Chris@16: typedef typename M::value_type value_type; Chris@16: typedef typename M::const_reference const_reference; Chris@16: typedef typename boost::mpl::if_, Chris@16: typename M::const_reference, Chris@16: typename M::reference>::type reference; Chris@16: typedef typename boost::mpl::if_, Chris@16: typename M::const_closure_type, Chris@16: typename M::closure_type>::type matrix_closure_type; Chris@16: typedef basic_range range_type; Chris@16: typedef const self_type const_closure_type; Chris@16: typedef self_type closure_type; Chris@16: typedef typename storage_restrict_traits::storage_category storage_category; Chris@16: typedef typename M::orientation_category orientation_category; Chris@16: Chris@16: // Construction and destruction Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_range (matrix_type &data, const range_type &r1, const range_type &r2): Chris@16: data_ (data), r1_ (r1.preprocess (data.size1 ())), r2_ (r2.preprocess (data.size2 ())) { Chris@16: // Early checking of preconditions here. Chris@16: // BOOST_UBLAS_CHECK (r1_.start () <= data_.size1 () && Chris@16: // r1_.start () + r1_.size () <= data_.size1 (), bad_index ()); Chris@16: // BOOST_UBLAS_CHECK (r2_.start () <= data_.size2 () && Chris@16: // r2_.start () + r2_.size () <= data_.size2 (), bad_index ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_range (const matrix_closure_type &data, const range_type &r1, const range_type &r2, int): Chris@16: data_ (data), r1_ (r1.preprocess (data.size1 ())), r2_ (r2.preprocess (data.size2 ())) { Chris@16: // Early checking of preconditions here. Chris@16: // BOOST_UBLAS_CHECK (r1_.start () <= data_.size1 () && Chris@16: // r1_.start () + r1_.size () <= data_.size1 (), bad_index ()); Chris@16: // BOOST_UBLAS_CHECK (r2_.start () <= data_.size2 () && Chris@16: // r2_.start () + r2_.size () <= data_.size2 (), bad_index ()); Chris@16: } Chris@16: Chris@16: // Accessors Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type start1 () const { Chris@16: return r1_.start (); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type size1 () const { Chris@16: return r1_.size (); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type start2() const { Chris@16: return r2_.start (); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type size2 () const { Chris@16: return r2_.size (); Chris@16: } Chris@16: Chris@16: // Storage accessors Chris@16: BOOST_UBLAS_INLINE Chris@16: const matrix_closure_type &data () const { Chris@16: return data_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_closure_type &data () { Chris@16: return data_; Chris@16: } Chris@16: Chris@16: // Element access Chris@16: #ifndef BOOST_UBLAS_PROXY_CONST_MEMBER Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator () (size_type i, size_type j) const { Chris@16: return data_ (r1_ (i), r2_ (j)); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator () (size_type i, size_type j) { Chris@16: return data_ (r1_ (i), r2_ (j)); Chris@16: } Chris@16: #else Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator () (size_type i, size_type j) const { Chris@16: return data_ (r1_ (i), r2_ (j)); Chris@16: } Chris@16: #endif Chris@16: Chris@16: // ISSUE can this be done in free project function? Chris@16: // Although a const function can create a non-const proxy to a non-const object Chris@16: // Critical is that matrix_type and data_ (vector_closure_type) are const correct Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_range project (const range_type &r1, const range_type &r2) const { Chris@16: return matrix_range (data_, r1_.compose (r1.preprocess (data_.size1 ())), r2_.compose (r2.preprocess (data_.size2 ())), 0); Chris@16: } Chris@16: Chris@16: // Assignment Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_range &operator = (const matrix_range &mr) { Chris@16: matrix_assign (*this, mr); Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_range &assign_temporary (matrix_range &mr) { Chris@16: return *this = mr; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_range &operator = (const matrix_expression &ae) { Chris@16: matrix_assign (*this, typename matrix_temporary_traits::type (ae)); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_range &assign (const matrix_expression &ae) { Chris@16: matrix_assign (*this, ae); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_range& operator += (const matrix_expression &ae) { Chris@16: matrix_assign (*this, typename matrix_temporary_traits::type (*this + ae)); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_range &plus_assign (const matrix_expression &ae) { Chris@16: matrix_assign (*this, ae); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_range& operator -= (const matrix_expression &ae) { Chris@16: matrix_assign (*this, typename matrix_temporary_traits::type (*this - ae)); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_range &minus_assign (const matrix_expression &ae) { Chris@16: matrix_assign (*this, ae); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_range& operator *= (const AT &at) { Chris@16: matrix_assign_scalar (*this, at); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_range& operator /= (const AT &at) { Chris@16: matrix_assign_scalar (*this, at); Chris@16: return *this; Chris@16: } Chris@16: Chris@16: // Closure comparison Chris@16: BOOST_UBLAS_INLINE Chris@16: bool same_closure (const matrix_range &mr) const { Chris@16: return (*this).data_.same_closure (mr.data_); Chris@16: } Chris@16: Chris@16: // Comparison Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator == (const matrix_range &mr) const { Chris@16: return (*this).data_ == (mr.data_) && r1_ == mr.r1_ && r2_ == mr.r2_; Chris@16: } Chris@16: Chris@16: // Swapping Chris@16: BOOST_UBLAS_INLINE Chris@16: void swap (matrix_range mr) { Chris@16: if (this != &mr) { Chris@16: BOOST_UBLAS_CHECK (size1 () == mr.size1 (), bad_size ()); Chris@16: BOOST_UBLAS_CHECK (size2 () == mr.size2 (), bad_size ()); Chris@16: matrix_swap (*this, mr); Chris@16: } Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: friend void swap (matrix_range mr1, matrix_range mr2) { Chris@16: mr1.swap (mr2); Chris@16: } Chris@16: Chris@16: // Iterator types Chris@16: private: Chris@16: typedef typename M::const_iterator1 const_subiterator1_type; Chris@16: typedef typename boost::mpl::if_, Chris@16: typename M::const_iterator1, Chris@16: typename M::iterator1>::type subiterator1_type; Chris@16: typedef typename M::const_iterator2 const_subiterator2_type; Chris@16: typedef typename boost::mpl::if_, Chris@16: typename M::const_iterator2, Chris@16: typename M::iterator2>::type subiterator2_type; Chris@16: Chris@16: public: Chris@16: #ifdef BOOST_UBLAS_USE_INDEXED_ITERATOR Chris@16: typedef indexed_iterator1, Chris@16: typename subiterator1_type::iterator_category> iterator1; Chris@16: typedef indexed_iterator2, Chris@16: typename subiterator2_type::iterator_category> iterator2; Chris@16: typedef indexed_const_iterator1, Chris@16: typename const_subiterator1_type::iterator_category> const_iterator1; Chris@16: typedef indexed_const_iterator2, Chris@16: typename const_subiterator2_type::iterator_category> const_iterator2; Chris@16: #else Chris@16: class const_iterator1; Chris@16: class iterator1; Chris@16: class const_iterator2; Chris@16: class iterator2; Chris@16: #endif Chris@16: typedef reverse_iterator_base1 const_reverse_iterator1; Chris@16: typedef reverse_iterator_base1 reverse_iterator1; Chris@16: typedef reverse_iterator_base2 const_reverse_iterator2; Chris@16: typedef reverse_iterator_base2 reverse_iterator2; Chris@16: Chris@16: // Element lookup Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator1 find1 (int rank, size_type i, size_type j) const { Chris@16: const_subiterator1_type it1 (data_.find1 (rank, start1 () + i, start2 () + j)); Chris@16: #ifdef BOOST_UBLAS_USE_INDEXED_ITERATOR Chris@16: return const_iterator1 (*this, it1.index1 (), it1.index2 ()); Chris@16: #else Chris@16: return const_iterator1 (*this, it1); Chris@16: #endif Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator1 find1 (int rank, size_type i, size_type j) { Chris@16: subiterator1_type it1 (data_.find1 (rank, start1 () + i, start2 () + j)); Chris@16: #ifdef BOOST_UBLAS_USE_INDEXED_ITERATOR Chris@16: return iterator1 (*this, it1.index1 (), it1.index2 ()); Chris@16: #else Chris@16: return iterator1 (*this, it1); Chris@16: #endif Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 find2 (int rank, size_type i, size_type j) const { Chris@16: const_subiterator2_type it2 (data_.find2 (rank, start1 () + i, start2 () + j)); Chris@16: #ifdef BOOST_UBLAS_USE_INDEXED_ITERATOR Chris@16: return const_iterator2 (*this, it2.index1 (), it2.index2 ()); Chris@16: #else Chris@16: return const_iterator2 (*this, it2); Chris@16: #endif Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator2 find2 (int rank, size_type i, size_type j) { Chris@16: subiterator2_type it2 (data_.find2 (rank, start1 () + i, start2 () + j)); Chris@16: #ifdef BOOST_UBLAS_USE_INDEXED_ITERATOR Chris@16: return iterator2 (*this, it2.index1 (), it2.index2 ()); Chris@16: #else Chris@16: return iterator2 (*this, it2); Chris@16: #endif Chris@16: } Chris@16: Chris@16: Chris@16: #ifndef BOOST_UBLAS_USE_INDEXED_ITERATOR Chris@16: class const_iterator1: Chris@16: public container_const_reference, Chris@16: public iterator_base_traits::template Chris@16: iterator_base::type { Chris@16: public: Chris@16: typedef typename const_subiterator1_type::value_type value_type; Chris@16: typedef typename const_subiterator1_type::difference_type difference_type; Chris@16: typedef typename const_subiterator1_type::reference reference; Chris@16: typedef typename const_subiterator1_type::pointer pointer; Chris@16: typedef const_iterator2 dual_iterator_type; Chris@16: typedef const_reverse_iterator2 dual_reverse_iterator_type; Chris@16: Chris@16: // Construction and destruction Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator1 (): Chris@16: container_const_reference (), it_ () {} Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator1 (const self_type &mr, const const_subiterator1_type &it): Chris@16: container_const_reference (mr), it_ (it) {} Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator1 (const iterator1 &it): Chris@16: container_const_reference (it ()), it_ (it.it_) {} Chris@16: Chris@16: // Arithmetic Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator1 &operator ++ () { Chris@16: ++ it_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator1 &operator -- () { Chris@16: -- it_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator1 &operator += (difference_type n) { Chris@16: it_ += n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator1 &operator -= (difference_type n) { Chris@16: it_ -= n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: difference_type operator - (const const_iterator1 &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return it_ - it.it_; Chris@16: } Chris@16: Chris@16: // Dereference Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator * () const { Chris@16: return *it_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator [] (difference_type n) const { Chris@16: return *(*this + n); Chris@16: } Chris@16: Chris@16: #ifndef BOOST_UBLAS_NO_NESTED_CLASS_RELATION Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@16: const_iterator2 begin () const { Chris@16: const self_type &mr = (*this) (); Chris@16: return mr.find2 (1, index1 (), 0); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@101: const_iterator2 cbegin () const { Chris@101: return begin (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@101: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@101: typename self_type:: Chris@101: #endif Chris@16: const_iterator2 end () const { Chris@16: const self_type &mr = (*this) (); Chris@16: return mr.find2 (1, index1 (), mr.size2 ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@101: const_iterator2 cend () const { Chris@101: return end (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@101: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@101: typename self_type:: Chris@101: #endif Chris@16: const_reverse_iterator2 rbegin () const { Chris@16: return const_reverse_iterator2 (end ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@101: const_reverse_iterator2 crbegin () const { Chris@101: return rbegin (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@101: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@101: typename self_type:: Chris@101: #endif Chris@16: const_reverse_iterator2 rend () const { Chris@16: return const_reverse_iterator2 (begin ()); Chris@16: } Chris@101: BOOST_UBLAS_INLINE Chris@101: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@101: typename self_type:: Chris@101: #endif Chris@101: const_reverse_iterator2 crend () const { Chris@101: return rend (); Chris@101: } Chris@16: #endif Chris@16: Chris@16: // Indices Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index1 () const { Chris@16: return it_.index1 () - (*this) ().start1 (); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index2 () const { Chris@16: return it_.index2 () - (*this) ().start2 (); Chris@16: } Chris@16: Chris@16: // Assignment Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator1 &operator = (const const_iterator1 &it) { Chris@16: container_const_reference::assign (&it ()); Chris@16: it_ = it.it_; Chris@16: return *this; Chris@16: } Chris@16: Chris@16: // Comparison Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator == (const const_iterator1 &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return it_ == it.it_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator < (const const_iterator1 &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return it_ < it.it_; Chris@16: } Chris@16: Chris@16: private: Chris@16: const_subiterator1_type it_; Chris@16: }; Chris@16: #endif Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator1 begin1 () const { Chris@16: return find1 (0, 0, 0); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@101: const_iterator1 cbegin1 () const { Chris@101: return begin1 (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@16: const_iterator1 end1 () const { Chris@16: return find1 (0, size1 (), 0); Chris@16: } Chris@101: BOOST_UBLAS_INLINE Chris@101: const_iterator1 cend1 () const { Chris@101: return end1 (); Chris@101: } Chris@16: Chris@16: #ifndef BOOST_UBLAS_USE_INDEXED_ITERATOR Chris@16: class iterator1: Chris@16: public container_reference, Chris@16: public iterator_base_traits::template Chris@16: iterator_base::type { Chris@16: public: Chris@16: typedef typename subiterator1_type::value_type value_type; Chris@16: typedef typename subiterator1_type::difference_type difference_type; Chris@16: typedef typename subiterator1_type::reference reference; Chris@16: typedef typename subiterator1_type::pointer pointer; Chris@16: typedef iterator2 dual_iterator_type; Chris@16: typedef reverse_iterator2 dual_reverse_iterator_type; Chris@16: Chris@16: // Construction and destruction Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator1 (): Chris@16: container_reference (), it_ () {} Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator1 (self_type &mr, const subiterator1_type &it): Chris@16: container_reference (mr), it_ (it) {} Chris@16: Chris@16: // Arithmetic Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator1 &operator ++ () { Chris@16: ++ it_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator1 &operator -- () { Chris@16: -- it_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator1 &operator += (difference_type n) { Chris@16: it_ += n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator1 &operator -= (difference_type n) { Chris@16: it_ -= n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: difference_type operator - (const iterator1 &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return it_ - it.it_; Chris@16: } Chris@16: Chris@16: // Dereference Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator * () const { Chris@16: return *it_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator [] (difference_type n) const { Chris@16: return *(*this + n); Chris@16: } Chris@16: Chris@16: #ifndef BOOST_UBLAS_NO_NESTED_CLASS_RELATION Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@16: iterator2 begin () const { Chris@16: self_type &mr = (*this) (); Chris@16: return mr.find2 (1, index1 (), 0); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@16: iterator2 end () const { Chris@16: self_type &mr = (*this) (); Chris@16: return mr.find2 (1, index1 (), mr.size2 ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@16: reverse_iterator2 rbegin () const { Chris@16: return reverse_iterator2 (end ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@16: reverse_iterator2 rend () const { Chris@16: return reverse_iterator2 (begin ()); Chris@16: } Chris@16: #endif Chris@16: Chris@16: // Indices Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index1 () const { Chris@16: return it_.index1 () - (*this) ().start1 (); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index2 () const { Chris@16: return it_.index2 () - (*this) ().start2 (); Chris@16: } Chris@16: Chris@16: // Assignment Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator1 &operator = (const iterator1 &it) { Chris@16: container_reference::assign (&it ()); Chris@16: it_ = it.it_; Chris@16: return *this; Chris@16: } Chris@16: Chris@16: // Comparison Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator == (const iterator1 &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return it_ == it.it_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator < (const iterator1 &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return it_ < it.it_; Chris@16: } Chris@16: Chris@16: private: Chris@16: subiterator1_type it_; Chris@16: Chris@16: friend class const_iterator1; Chris@16: }; Chris@16: #endif Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator1 begin1 () { Chris@16: return find1 (0, 0, 0); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator1 end1 () { Chris@16: return find1 (0, size1 (), 0); Chris@16: } Chris@16: Chris@16: #ifndef BOOST_UBLAS_USE_INDEXED_ITERATOR Chris@16: class const_iterator2: Chris@16: public container_const_reference, Chris@16: public iterator_base_traits::template Chris@16: iterator_base::type { Chris@16: public: Chris@16: typedef typename const_subiterator2_type::value_type value_type; Chris@16: typedef typename const_subiterator2_type::difference_type difference_type; Chris@16: typedef typename const_subiterator2_type::reference reference; Chris@16: typedef typename const_subiterator2_type::pointer pointer; Chris@16: typedef const_iterator1 dual_iterator_type; Chris@16: typedef const_reverse_iterator1 dual_reverse_iterator_type; Chris@16: Chris@16: // Construction and destruction Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 (): Chris@16: container_const_reference (), it_ () {} Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 (const self_type &mr, const const_subiterator2_type &it): Chris@16: container_const_reference (mr), it_ (it) {} Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 (const iterator2 &it): Chris@16: container_const_reference (it ()), it_ (it.it_) {} Chris@16: Chris@16: // Arithmetic Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 &operator ++ () { Chris@16: ++ it_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 &operator -- () { Chris@16: -- it_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 &operator += (difference_type n) { Chris@16: it_ += n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 &operator -= (difference_type n) { Chris@16: it_ -= n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: difference_type operator - (const const_iterator2 &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return it_ - it.it_; Chris@16: } Chris@16: Chris@16: // Dereference Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator * () const { Chris@16: return *it_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator [] (difference_type n) const { Chris@16: return *(*this + n); Chris@16: } Chris@16: Chris@16: #ifndef BOOST_UBLAS_NO_NESTED_CLASS_RELATION Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@16: const_iterator1 begin () const { Chris@16: const self_type &mr = (*this) (); Chris@16: return mr.find1 (1, 0, index2 ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@101: const_iterator1 cbegin () const { Chris@101: return begin (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@101: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@101: typename self_type:: Chris@101: #endif Chris@16: const_iterator1 end () const { Chris@16: const self_type &mr = (*this) (); Chris@16: return mr.find1 (1, mr.size1 (), index2 ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@101: const_iterator1 cend () const { Chris@101: return end (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@101: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@101: typename self_type:: Chris@101: #endif Chris@16: const_reverse_iterator1 rbegin () const { Chris@16: return const_reverse_iterator1 (end ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@101: const_reverse_iterator1 crbegin () const { Chris@101: return rbegin (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@101: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@101: typename self_type:: Chris@101: #endif Chris@16: const_reverse_iterator1 rend () const { Chris@16: return const_reverse_iterator1 (begin ()); Chris@16: } Chris@101: BOOST_UBLAS_INLINE Chris@101: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@101: typename self_type:: Chris@101: #endif Chris@101: const_reverse_iterator1 crend () const { Chris@101: return rend (); Chris@101: } Chris@16: #endif Chris@16: Chris@16: // Indices Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index1 () const { Chris@16: return it_.index1 () - (*this) ().start1 (); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index2 () const { Chris@16: return it_.index2 () - (*this) ().start2 (); Chris@16: } Chris@16: Chris@16: // Assignment Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 &operator = (const const_iterator2 &it) { Chris@16: container_const_reference::assign (&it ()); Chris@16: it_ = it.it_; Chris@16: return *this; Chris@16: } Chris@16: Chris@16: // Comparison Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator == (const const_iterator2 &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return it_ == it.it_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator < (const const_iterator2 &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return it_ < it.it_; Chris@16: } Chris@16: Chris@16: private: Chris@16: const_subiterator2_type it_; Chris@16: }; Chris@16: #endif Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 begin2 () const { Chris@16: return find2 (0, 0, 0); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@101: const_iterator2 cbegin2 () const { Chris@101: return begin2 (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@16: const_iterator2 end2 () const { Chris@16: return find2 (0, 0, size2 ()); Chris@16: } Chris@101: BOOST_UBLAS_INLINE Chris@101: const_iterator2 cend2 () const { Chris@101: return end2 (); Chris@101: } Chris@16: Chris@16: #ifndef BOOST_UBLAS_USE_INDEXED_ITERATOR Chris@16: class iterator2: Chris@16: public container_reference, Chris@16: public iterator_base_traits::template Chris@16: iterator_base::type { Chris@16: public: Chris@16: typedef typename subiterator2_type::value_type value_type; Chris@16: typedef typename subiterator2_type::difference_type difference_type; Chris@16: typedef typename subiterator2_type::reference reference; Chris@16: typedef typename subiterator2_type::pointer pointer; Chris@16: typedef iterator1 dual_iterator_type; Chris@16: typedef reverse_iterator1 dual_reverse_iterator_type; Chris@16: Chris@16: // Construction and destruction Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator2 (): Chris@16: container_reference (), it_ () {} Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator2 (self_type &mr, const subiterator2_type &it): Chris@16: container_reference (mr), it_ (it) {} Chris@16: Chris@16: // Arithmetic Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator2 &operator ++ () { Chris@16: ++ it_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator2 &operator -- () { Chris@16: -- it_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator2 &operator += (difference_type n) { Chris@16: it_ += n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator2 &operator -= (difference_type n) { Chris@16: it_ -= n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: difference_type operator - (const iterator2 &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return it_ - it.it_; Chris@16: } Chris@16: Chris@16: // Dereference Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator * () const { Chris@16: return *it_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator [] (difference_type n) const { Chris@16: return *(*this + n); Chris@16: } Chris@16: Chris@16: #ifndef BOOST_UBLAS_NO_NESTED_CLASS_RELATION Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@16: iterator1 begin () const { Chris@16: self_type &mr = (*this) (); Chris@16: return mr.find1 (1, 0, index2 ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@16: iterator1 end () const { Chris@16: self_type &mr = (*this) (); Chris@16: return mr.find1 (1, mr.size1 (), index2 ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@16: reverse_iterator1 rbegin () const { Chris@16: return reverse_iterator1 (end ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@16: reverse_iterator1 rend () const { Chris@16: return reverse_iterator1 (begin ()); Chris@16: } Chris@16: #endif Chris@16: Chris@16: // Indices Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index1 () const { Chris@16: return it_.index1 () - (*this) ().start1 (); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index2 () const { Chris@16: return it_.index2 () - (*this) ().start2 (); Chris@16: } Chris@16: Chris@16: // Assignment Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator2 &operator = (const iterator2 &it) { Chris@16: container_reference::assign (&it ()); Chris@16: it_ = it.it_; Chris@16: return *this; Chris@16: } Chris@16: Chris@16: // Comparison Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator == (const iterator2 &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return it_ == it.it_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator < (const iterator2 &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: return it_ < it.it_; Chris@16: } Chris@16: Chris@16: private: Chris@16: subiterator2_type it_; Chris@16: Chris@16: friend class const_iterator2; Chris@16: }; Chris@16: #endif Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator2 begin2 () { Chris@16: return find2 (0, 0, 0); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator2 end2 () { Chris@16: return find2 (0, 0, size2 ()); Chris@16: } Chris@16: Chris@16: // Reverse iterators Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reverse_iterator1 rbegin1 () const { Chris@16: return const_reverse_iterator1 (end1 ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@101: const_reverse_iterator1 crbegin1 () const { Chris@101: return rbegin1 (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@16: const_reverse_iterator1 rend1 () const { Chris@16: return const_reverse_iterator1 (begin1 ()); Chris@16: } Chris@101: BOOST_UBLAS_INLINE Chris@101: const_reverse_iterator1 crend1 () const { Chris@101: return rend1 (); Chris@101: } Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: reverse_iterator1 rbegin1 () { Chris@16: return reverse_iterator1 (end1 ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reverse_iterator1 rend1 () { Chris@16: return reverse_iterator1 (begin1 ()); Chris@16: } Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reverse_iterator2 rbegin2 () const { Chris@16: return const_reverse_iterator2 (end2 ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@101: const_reverse_iterator2 crbegin2 () const { Chris@101: return rbegin2 (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@16: const_reverse_iterator2 rend2 () const { Chris@16: return const_reverse_iterator2 (begin2 ()); Chris@16: } Chris@101: BOOST_UBLAS_INLINE Chris@101: const_reverse_iterator2 crend2 () const { Chris@101: return rend2 (); Chris@101: } Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: reverse_iterator2 rbegin2 () { Chris@16: return reverse_iterator2 (end2 ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reverse_iterator2 rend2 () { Chris@16: return reverse_iterator2 (begin2 ()); Chris@16: } Chris@16: Chris@16: private: Chris@16: matrix_closure_type data_; Chris@16: range_type r1_; Chris@16: range_type r2_; Chris@16: }; Chris@16: Chris@16: // Simple Projections Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_range subrange (M &data, typename M::size_type start1, typename M::size_type stop1, typename M::size_type start2, typename M::size_type stop2) { Chris@16: typedef basic_range range_type; Chris@16: return matrix_range (data, range_type (start1, stop1), range_type (start2, stop2)); Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_range subrange (const M &data, typename M::size_type start1, typename M::size_type stop1, typename M::size_type start2, typename M::size_type stop2) { Chris@16: typedef basic_range range_type; Chris@16: return matrix_range (data, range_type (start1, stop1), range_type (start2, stop2)); Chris@16: } Chris@16: Chris@16: // Generic Projections Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_range project (M &data, const typename matrix_range::range_type &r1, const typename matrix_range::range_type &r2) { Chris@16: return matrix_range (data, r1, r2); Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: const matrix_range project (const M &data, const typename matrix_range::range_type &r1, const typename matrix_range::range_type &r2) { Chris@16: // ISSUE was: return matrix_range (const_cast (data), r1, r2); Chris@16: return matrix_range (data, r1, r2); Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_range project (matrix_range &data, const typename matrix_range::range_type &r1, const typename matrix_range::range_type &r2) { Chris@16: return data.project (r1, r2); Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: const matrix_range project (const matrix_range &data, const typename matrix_range::range_type &r1, const typename matrix_range::range_type &r2) { Chris@16: return data.project (r1, r2); Chris@16: } Chris@16: Chris@16: // Specialization of temporary_traits Chris@16: template Chris@16: struct matrix_temporary_traits< matrix_range > Chris@16: : matrix_temporary_traits< M > {} ; Chris@16: template Chris@16: struct matrix_temporary_traits< const matrix_range > Chris@16: : matrix_temporary_traits< M > {} ; Chris@16: Chris@16: template Chris@16: struct vector_temporary_traits< matrix_range > Chris@16: : vector_temporary_traits< M > {} ; Chris@16: template Chris@16: struct vector_temporary_traits< const matrix_range > Chris@16: : vector_temporary_traits< M > {} ; Chris@16: Chris@16: // Matrix based slice class Chris@16: template Chris@16: class matrix_slice: Chris@16: public matrix_expression > { Chris@16: Chris@16: typedef matrix_slice self_type; Chris@16: public: Chris@16: #ifdef BOOST_UBLAS_ENABLE_PROXY_SHORTCUTS Chris@16: using matrix_expression::operator (); Chris@16: #endif Chris@16: typedef M matrix_type; Chris@16: typedef typename M::size_type size_type; Chris@16: typedef typename M::difference_type difference_type; Chris@16: typedef typename M::value_type value_type; Chris@16: typedef typename M::const_reference const_reference; Chris@16: typedef typename boost::mpl::if_, Chris@16: typename M::const_reference, Chris@16: typename M::reference>::type reference; Chris@16: typedef typename boost::mpl::if_, Chris@16: typename M::const_closure_type, Chris@16: typename M::closure_type>::type matrix_closure_type; Chris@16: typedef basic_range range_type; Chris@16: typedef basic_slice slice_type; Chris@16: typedef const self_type const_closure_type; Chris@16: typedef self_type closure_type; Chris@16: typedef typename storage_restrict_traits::storage_category storage_category; Chris@16: typedef typename M::orientation_category orientation_category; Chris@16: Chris@16: // Construction and destruction Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_slice (matrix_type &data, const slice_type &s1, const slice_type &s2): Chris@16: data_ (data), s1_ (s1.preprocess (data.size1 ())), s2_ (s2.preprocess (data.size2 ())) { Chris@16: // Early checking of preconditions here. Chris@16: // BOOST_UBLAS_CHECK (s1_.start () <= data_.size1 () && Chris@16: // s1_.start () + s1_.stride () * (s1_.size () - (s1_.size () > 0)) <= data_.size1 (), bad_index ()); Chris@16: // BOOST_UBLAS_CHECK (s2_.start () <= data_.size2 () && Chris@16: // s2_.start () + s2_.stride () * (s2_.size () - (s2_.size () > 0)) <= data_.size2 (), bad_index ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_slice (const matrix_closure_type &data, const slice_type &s1, const slice_type &s2, int): Chris@16: data_ (data), s1_ (s1.preprocess (data.size1 ())), s2_ (s2.preprocess (data.size2 ())) { Chris@16: // Early checking of preconditions. Chris@16: // BOOST_UBLAS_CHECK (s1_.start () <= data_.size1 () && Chris@16: // s1_.start () + s1_.stride () * (s1_.size () - (s1_.size () > 0)) <= data_.size1 (), bad_index ()); Chris@16: // BOOST_UBLAS_CHECK (s2_.start () <= data_.size2 () && Chris@16: // s2_.start () + s2_.stride () * (s2_.size () - (s2_.size () > 0)) <= data_.size2 (), bad_index ()); Chris@16: } Chris@16: Chris@16: // Accessors Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type start1 () const { Chris@16: return s1_.start (); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type start2 () const { Chris@16: return s2_.start (); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: difference_type stride1 () const { Chris@16: return s1_.stride (); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: difference_type stride2 () const { Chris@16: return s2_.stride (); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type size1 () const { Chris@16: return s1_.size (); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type size2 () const { Chris@16: return s2_.size (); Chris@16: } Chris@16: Chris@16: // Storage accessors Chris@16: BOOST_UBLAS_INLINE Chris@16: const matrix_closure_type &data () const { Chris@16: return data_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_closure_type &data () { Chris@16: return data_; Chris@16: } Chris@16: Chris@16: // Element access Chris@16: #ifndef BOOST_UBLAS_PROXY_CONST_MEMBER Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator () (size_type i, size_type j) const { Chris@16: return data_ (s1_ (i), s2_ (j)); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator () (size_type i, size_type j) { Chris@16: return data_ (s1_ (i), s2_ (j)); Chris@16: } Chris@16: #else Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator () (size_type i, size_type j) const { Chris@16: return data_ (s1_ (i), s2_ (j)); Chris@16: } Chris@16: #endif Chris@16: Chris@16: // ISSUE can this be done in free project function? Chris@16: // Although a const function can create a non-const proxy to a non-const object Chris@16: // Critical is that matrix_type and data_ (vector_closure_type) are const correct Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_slice project (const range_type &r1, const range_type &r2) const { Chris@16: return matrix_slice (data_, s1_.compose (r1.preprocess (data_.size1 ())), s2_.compose (r2.preprocess (data_.size2 ())), 0); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_slice project (const slice_type &s1, const slice_type &s2) const { Chris@16: return matrix_slice (data_, s1_.compose (s1.preprocess (data_.size1 ())), s2_.compose (s2.preprocess (data_.size2 ())), 0); Chris@16: } Chris@16: Chris@16: // Assignment Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_slice &operator = (const matrix_slice &ms) { Chris@16: matrix_assign (*this, ms); Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_slice &assign_temporary (matrix_slice &ms) { Chris@16: return *this = ms; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_slice &operator = (const matrix_expression &ae) { Chris@16: matrix_assign (*this, typename matrix_temporary_traits::type (ae)); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_slice &assign (const matrix_expression &ae) { Chris@16: matrix_assign (*this, ae); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_slice& operator += (const matrix_expression &ae) { Chris@16: matrix_assign (*this, typename matrix_temporary_traits::type (*this + ae)); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_slice &plus_assign (const matrix_expression &ae) { Chris@16: matrix_assign (*this, ae); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_slice& operator -= (const matrix_expression &ae) { Chris@16: matrix_assign (*this, typename matrix_temporary_traits::type (*this - ae)); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_slice &minus_assign (const matrix_expression &ae) { Chris@16: matrix_assign (*this, ae); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_slice& operator *= (const AT &at) { Chris@16: matrix_assign_scalar (*this, at); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_slice& operator /= (const AT &at) { Chris@16: matrix_assign_scalar (*this, at); Chris@16: return *this; Chris@16: } Chris@16: Chris@16: // Closure comparison Chris@16: BOOST_UBLAS_INLINE Chris@16: bool same_closure (const matrix_slice &ms) const { Chris@16: return (*this).data_.same_closure (ms.data_); Chris@16: } Chris@16: Chris@16: // Comparison Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator == (const matrix_slice &ms) const { Chris@16: return (*this).data_ == ms.data_ && s1_ == ms.s1_ && s2_ == ms.s2_; Chris@16: } Chris@16: Chris@16: // Swapping Chris@16: BOOST_UBLAS_INLINE Chris@16: void swap (matrix_slice ms) { Chris@16: if (this != &ms) { Chris@16: BOOST_UBLAS_CHECK (size1 () == ms.size1 (), bad_size ()); Chris@16: BOOST_UBLAS_CHECK (size2 () == ms.size2 (), bad_size ()); Chris@16: matrix_swap (*this, ms); Chris@16: } Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: friend void swap (matrix_slice ms1, matrix_slice ms2) { Chris@16: ms1.swap (ms2); Chris@16: } Chris@16: Chris@16: // Iterator types Chris@16: private: Chris@16: // Use slice as an index - FIXME this fails for packed assignment Chris@16: typedef typename slice_type::const_iterator const_subiterator1_type; Chris@16: typedef typename slice_type::const_iterator subiterator1_type; Chris@16: typedef typename slice_type::const_iterator const_subiterator2_type; Chris@16: typedef typename slice_type::const_iterator subiterator2_type; Chris@16: Chris@16: public: Chris@16: #ifdef BOOST_UBLAS_USE_INDEXED_ITERATOR Chris@16: typedef indexed_iterator1, Chris@16: typename matrix_type::iterator1::iterator_category> iterator1; Chris@16: typedef indexed_iterator2, Chris@16: typename matrix_type::iterator2::iterator_category> iterator2; Chris@16: typedef indexed_const_iterator1, Chris@16: typename matrix_type::const_iterator1::iterator_category> const_iterator1; Chris@16: typedef indexed_const_iterator2, Chris@16: typename matrix_type::const_iterator2::iterator_category> const_iterator2; Chris@16: #else Chris@16: class const_iterator1; Chris@16: class iterator1; Chris@16: class const_iterator2; Chris@16: class iterator2; Chris@16: #endif Chris@16: typedef reverse_iterator_base1 const_reverse_iterator1; Chris@16: typedef reverse_iterator_base1 reverse_iterator1; Chris@16: typedef reverse_iterator_base2 const_reverse_iterator2; Chris@16: typedef reverse_iterator_base2 reverse_iterator2; Chris@16: Chris@16: // Element lookup Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator1 find1 (int /* rank */, size_type i, size_type j) const { Chris@16: #ifdef BOOST_UBLAS_USE_INDEXED_ITERATOR Chris@16: return const_iterator1 (*this, i, j); Chris@16: #else Chris@16: return const_iterator1 (*this, s1_.begin () + i, s2_.begin () + j); Chris@16: #endif Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator1 find1 (int /* rank */, size_type i, size_type j) { Chris@16: #ifdef BOOST_UBLAS_USE_INDEXED_ITERATOR Chris@16: return iterator1 (*this, i, j); Chris@16: #else Chris@16: return iterator1 (*this, s1_.begin () + i, s2_.begin () + j); Chris@16: #endif Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 find2 (int /* rank */, size_type i, size_type j) const { Chris@16: #ifdef BOOST_UBLAS_USE_INDEXED_ITERATOR Chris@16: return const_iterator2 (*this, i, j); Chris@16: #else Chris@16: return const_iterator2 (*this, s1_.begin () + i, s2_.begin () + j); Chris@16: #endif Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator2 find2 (int /* rank */, size_type i, size_type j) { Chris@16: #ifdef BOOST_UBLAS_USE_INDEXED_ITERATOR Chris@16: return iterator2 (*this, i, j); Chris@16: #else Chris@16: return iterator2 (*this, s1_.begin () + i, s2_.begin () + j); Chris@16: #endif Chris@16: } Chris@16: Chris@16: // Iterators simply are indices. Chris@16: Chris@16: #ifndef BOOST_UBLAS_USE_INDEXED_ITERATOR Chris@16: class const_iterator1: Chris@16: public container_const_reference, Chris@16: public iterator_base_traits::template Chris@16: iterator_base::type { Chris@16: public: Chris@16: typedef typename M::const_iterator1::value_type value_type; Chris@16: typedef typename M::const_iterator1::difference_type difference_type; Chris@16: typedef typename M::const_reference reference; //FIXME due to indexing access Chris@16: typedef typename M::const_iterator1::pointer pointer; Chris@16: typedef const_iterator2 dual_iterator_type; Chris@16: typedef const_reverse_iterator2 dual_reverse_iterator_type; Chris@16: Chris@16: // Construction and destruction Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator1 (): Chris@16: container_const_reference (), it1_ (), it2_ () {} Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator1 (const self_type &ms, const const_subiterator1_type &it1, const const_subiterator2_type &it2): Chris@16: container_const_reference (ms), it1_ (it1), it2_ (it2) {} Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator1 (const iterator1 &it): Chris@16: container_const_reference (it ()), it1_ (it.it1_), it2_ (it.it2_) {} Chris@16: Chris@16: // Arithmetic Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator1 &operator ++ () { Chris@16: ++ it1_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator1 &operator -- () { Chris@16: -- it1_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator1 &operator += (difference_type n) { Chris@16: it1_ += n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator1 &operator -= (difference_type n) { Chris@16: it1_ -= n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: difference_type operator - (const const_iterator1 &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: BOOST_UBLAS_CHECK (it2_ == it.it2_, external_logic ()); Chris@16: return it1_ - it.it1_; Chris@16: } Chris@16: Chris@16: // Dereference Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator * () const { Chris@16: // FIXME replace find with at_element Chris@16: return (*this) ().data_ (*it1_, *it2_); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator [] (difference_type n) const { Chris@16: return *(*this + n); Chris@16: } Chris@16: Chris@16: #ifndef BOOST_UBLAS_NO_NESTED_CLASS_RELATION Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@16: const_iterator2 begin () const { Chris@16: return const_iterator2 ((*this) (), it1_, it2_ ().begin ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@101: const_iterator2 cbegin () const { Chris@101: return begin (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@101: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@101: typename self_type:: Chris@101: #endif Chris@16: const_iterator2 end () const { Chris@16: return const_iterator2 ((*this) (), it1_, it2_ ().end ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@101: const_iterator2 cend () const { Chris@101: return end (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@101: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@101: typename self_type:: Chris@101: #endif Chris@16: const_reverse_iterator2 rbegin () const { Chris@16: return const_reverse_iterator2 (end ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@101: const_reverse_iterator2 crbegin () const { Chris@101: return rbegin (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@101: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@101: typename self_type:: Chris@101: #endif Chris@16: const_reverse_iterator2 rend () const { Chris@16: return const_reverse_iterator2 (begin ()); Chris@16: } Chris@101: BOOST_UBLAS_INLINE Chris@101: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@101: typename self_type:: Chris@101: #endif Chris@101: const_reverse_iterator2 crend () const { Chris@101: return rend (); Chris@101: } Chris@16: #endif Chris@16: Chris@16: // Indices Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index1 () const { Chris@16: return it1_.index (); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index2 () const { Chris@16: return it2_.index (); Chris@16: } Chris@16: Chris@16: // Assignment Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator1 &operator = (const const_iterator1 &it) { Chris@16: container_const_reference::assign (&it ()); Chris@16: it1_ = it.it1_; Chris@16: it2_ = it.it2_; Chris@16: return *this; Chris@16: } Chris@16: Chris@16: // Comparison Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator == (const const_iterator1 &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: BOOST_UBLAS_CHECK (it2_ == it.it2_, external_logic ()); Chris@16: return it1_ == it.it1_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator < (const const_iterator1 &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: BOOST_UBLAS_CHECK (it2_ == it.it2_, external_logic ()); Chris@16: return it1_ < it.it1_; Chris@16: } Chris@16: Chris@16: private: Chris@16: const_subiterator1_type it1_; Chris@16: const_subiterator2_type it2_; Chris@16: }; Chris@16: #endif Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator1 begin1 () const { Chris@16: return find1 (0, 0, 0); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@101: const_iterator1 cbegin1 () const { Chris@101: return begin1 (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@16: const_iterator1 end1 () const { Chris@16: return find1 (0, size1 (), 0); Chris@16: } Chris@101: BOOST_UBLAS_INLINE Chris@101: const_iterator1 cend1 () const { Chris@101: return end1 (); Chris@101: } Chris@16: Chris@16: #ifndef BOOST_UBLAS_USE_INDEXED_ITERATOR Chris@16: class iterator1: Chris@16: public container_reference, Chris@16: public iterator_base_traits::template Chris@16: iterator_base::type { Chris@16: public: Chris@16: typedef typename M::iterator1::value_type value_type; Chris@16: typedef typename M::iterator1::difference_type difference_type; Chris@16: typedef typename M::reference reference; //FIXME due to indexing access Chris@16: typedef typename M::iterator1::pointer pointer; Chris@16: typedef iterator2 dual_iterator_type; Chris@16: typedef reverse_iterator2 dual_reverse_iterator_type; Chris@16: Chris@16: // Construction and destruction Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator1 (): Chris@16: container_reference (), it1_ (), it2_ () {} Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator1 (self_type &ms, const subiterator1_type &it1, const subiterator2_type &it2): Chris@16: container_reference (ms), it1_ (it1), it2_ (it2) {} Chris@16: Chris@16: // Arithmetic Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator1 &operator ++ () { Chris@16: ++ it1_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator1 &operator -- () { Chris@16: -- it1_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator1 &operator += (difference_type n) { Chris@16: it1_ += n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator1 &operator -= (difference_type n) { Chris@16: it1_ -= n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: difference_type operator - (const iterator1 &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: BOOST_UBLAS_CHECK (it2_ == it.it2_, external_logic ()); Chris@16: return it1_ - it.it1_; Chris@16: } Chris@16: Chris@16: // Dereference Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator * () const { Chris@16: // FIXME replace find with at_element Chris@16: return (*this) ().data_ (*it1_, *it2_); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator [] (difference_type n) const { Chris@16: return *(*this + n); Chris@16: } Chris@16: Chris@16: #ifndef BOOST_UBLAS_NO_NESTED_CLASS_RELATION Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@16: iterator2 begin () const { Chris@16: return iterator2 ((*this) (), it1_, it2_ ().begin ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@16: iterator2 end () const { Chris@16: return iterator2 ((*this) (), it1_, it2_ ().end ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@16: reverse_iterator2 rbegin () const { Chris@16: return reverse_iterator2 (end ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@16: reverse_iterator2 rend () const { Chris@16: return reverse_iterator2 (begin ()); Chris@16: } Chris@16: #endif Chris@16: Chris@16: // Indices Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index1 () const { Chris@16: return it1_.index (); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index2 () const { Chris@16: return it2_.index (); Chris@16: } Chris@16: Chris@16: // Assignment Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator1 &operator = (const iterator1 &it) { Chris@16: container_reference::assign (&it ()); Chris@16: it1_ = it.it1_; Chris@16: it2_ = it.it2_; Chris@16: return *this; Chris@16: } Chris@16: Chris@16: // Comparison Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator == (const iterator1 &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: BOOST_UBLAS_CHECK (it2_ == it.it2_, external_logic ()); Chris@16: return it1_ == it.it1_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator < (const iterator1 &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: BOOST_UBLAS_CHECK (it2_ == it.it2_, external_logic ()); Chris@16: return it1_ < it.it1_; Chris@16: } Chris@16: Chris@16: private: Chris@16: subiterator1_type it1_; Chris@16: subiterator2_type it2_; Chris@16: Chris@16: friend class const_iterator1; Chris@16: }; Chris@16: #endif Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator1 begin1 () { Chris@16: return find1 (0, 0, 0); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator1 end1 () { Chris@16: return find1 (0, size1 (), 0); Chris@16: } Chris@16: Chris@16: #ifndef BOOST_UBLAS_USE_INDEXED_ITERATOR Chris@16: class const_iterator2: Chris@16: public container_const_reference, Chris@16: public iterator_base_traits::template Chris@16: iterator_base::type { Chris@16: public: Chris@16: typedef typename M::const_iterator2::value_type value_type; Chris@16: typedef typename M::const_iterator2::difference_type difference_type; Chris@16: typedef typename M::const_reference reference; //FIXME due to indexing access Chris@16: typedef typename M::const_iterator2::pointer pointer; Chris@16: typedef const_iterator1 dual_iterator_type; Chris@16: typedef const_reverse_iterator1 dual_reverse_iterator_type; Chris@16: Chris@16: // Construction and destruction Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 (): Chris@16: container_const_reference (), it1_ (), it2_ () {} Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 (const self_type &ms, const const_subiterator1_type &it1, const const_subiterator2_type &it2): Chris@16: container_const_reference (ms), it1_ (it1), it2_ (it2) {} Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 (const iterator2 &it): Chris@16: container_const_reference (it ()), it1_ (it.it1_), it2_ (it.it2_) {} Chris@16: Chris@16: // Arithmetic Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 &operator ++ () { Chris@16: ++ it2_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 &operator -- () { Chris@16: -- it2_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 &operator += (difference_type n) { Chris@16: it2_ += n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 &operator -= (difference_type n) { Chris@16: it2_ -= n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: difference_type operator - (const const_iterator2 &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: BOOST_UBLAS_CHECK (it1_ == it.it1_, external_logic ()); Chris@16: return it2_ - it.it2_; Chris@16: } Chris@16: Chris@16: // Dereference Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator * () const { Chris@16: // FIXME replace find with at_element Chris@16: return (*this) ().data_ (*it1_, *it2_); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator [] (difference_type n) const { Chris@16: return *(*this + n); Chris@16: } Chris@16: Chris@16: #ifndef BOOST_UBLAS_NO_NESTED_CLASS_RELATION Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@16: const_iterator1 begin () const { Chris@16: return const_iterator1 ((*this) (), it1_ ().begin (), it2_); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@101: const_iterator1 cbegin () const { Chris@101: return begin (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@101: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@101: typename self_type:: Chris@101: #endif Chris@16: const_iterator1 end () const { Chris@16: return const_iterator1 ((*this) (), it1_ ().end (), it2_); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@101: const_iterator1 cend () const { Chris@101: return end (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@101: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@101: typename self_type:: Chris@101: #endif Chris@16: const_reverse_iterator1 rbegin () const { Chris@16: return const_reverse_iterator1 (end ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@101: const_reverse_iterator1 crbegin () const { Chris@101: return rbegin (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@101: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@101: typename self_type:: Chris@101: #endif Chris@16: const_reverse_iterator1 rend () const { Chris@16: return const_reverse_iterator1 (begin ()); Chris@16: } Chris@101: BOOST_UBLAS_INLINE Chris@101: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@101: typename self_type:: Chris@101: #endif Chris@101: const_reverse_iterator1 crend () const { Chris@101: return rend (); Chris@101: } Chris@16: #endif Chris@16: Chris@16: // Indices Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index1 () const { Chris@16: return it1_.index (); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index2 () const { Chris@16: return it2_.index (); Chris@16: } Chris@16: Chris@16: // Assignment Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 &operator = (const const_iterator2 &it) { Chris@16: container_const_reference::assign (&it ()); Chris@16: it1_ = it.it1_; Chris@16: it2_ = it.it2_; Chris@16: return *this; Chris@16: } Chris@16: Chris@16: // Comparison Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator == (const const_iterator2 &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: BOOST_UBLAS_CHECK (it1_ == it.it1_, external_logic ()); Chris@16: return it2_ == it.it2_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator < (const const_iterator2 &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: BOOST_UBLAS_CHECK (it1_ == it.it1_, external_logic ()); Chris@16: return it2_ < it.it2_; Chris@16: } Chris@16: Chris@16: private: Chris@16: const_subiterator1_type it1_; Chris@16: const_subiterator2_type it2_; Chris@16: }; Chris@16: #endif Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 begin2 () const { Chris@16: return find2 (0, 0, 0); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@101: const_iterator2 cbegin2 () const { Chris@101: return begin2 (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@16: const_iterator2 end2 () const { Chris@16: return find2 (0, 0, size2 ()); Chris@16: } Chris@101: BOOST_UBLAS_INLINE Chris@101: const_iterator2 cend2 () const { Chris@101: return end2 (); Chris@101: } Chris@16: Chris@16: #ifndef BOOST_UBLAS_USE_INDEXED_ITERATOR Chris@16: class iterator2: Chris@16: public container_reference, Chris@16: public iterator_base_traits::template Chris@16: iterator_base::type { Chris@16: public: Chris@16: typedef typename M::iterator2::value_type value_type; Chris@16: typedef typename M::iterator2::difference_type difference_type; Chris@16: typedef typename M::reference reference; //FIXME due to indexing access Chris@16: typedef typename M::iterator2::pointer pointer; Chris@16: typedef iterator1 dual_iterator_type; Chris@16: typedef reverse_iterator1 dual_reverse_iterator_type; Chris@16: Chris@16: // Construction and destruction Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator2 (): Chris@16: container_reference (), it1_ (), it2_ () {} Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator2 (self_type &ms, const subiterator1_type &it1, const subiterator2_type &it2): Chris@16: container_reference (ms), it1_ (it1), it2_ (it2) {} Chris@16: Chris@16: // Arithmetic Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator2 &operator ++ () { Chris@16: ++ it2_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator2 &operator -- () { Chris@16: -- it2_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator2 &operator += (difference_type n) { Chris@16: it2_ += n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator2 &operator -= (difference_type n) { Chris@16: it2_ -= n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: difference_type operator - (const iterator2 &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: BOOST_UBLAS_CHECK (it1_ == it.it1_, external_logic ()); Chris@16: return it2_ - it.it2_; Chris@16: } Chris@16: Chris@16: // Dereference Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator * () const { Chris@16: // FIXME replace find with at_element Chris@16: return (*this) ().data_ (*it1_, *it2_); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator [] (difference_type n) const { Chris@16: return *(*this + n); Chris@16: } Chris@16: Chris@16: #ifndef BOOST_UBLAS_NO_NESTED_CLASS_RELATION Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@16: iterator1 begin () const { Chris@16: return iterator1 ((*this) (), it1_ ().begin (), it2_); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@16: iterator1 end () const { Chris@16: return iterator1 ((*this) (), it1_ ().end (), it2_); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@16: reverse_iterator1 rbegin () const { Chris@16: return reverse_iterator1 (end ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@16: reverse_iterator1 rend () const { Chris@16: return reverse_iterator1 (begin ()); Chris@16: } Chris@16: #endif Chris@16: Chris@16: // Indices Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index1 () const { Chris@16: return it1_.index (); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index2 () const { Chris@16: return it2_.index (); Chris@16: } Chris@16: Chris@16: // Assignment Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator2 &operator = (const iterator2 &it) { Chris@16: container_reference::assign (&it ()); Chris@16: it1_ = it.it1_; Chris@16: it2_ = it.it2_; Chris@16: return *this; Chris@16: } Chris@16: Chris@16: // Comparison Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator == (const iterator2 &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: BOOST_UBLAS_CHECK (it1_ == it.it1_, external_logic ()); Chris@16: return it2_ == it.it2_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator < (const iterator2 &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: BOOST_UBLAS_CHECK (it1_ == it.it1_, external_logic ()); Chris@16: return it2_ < it.it2_; Chris@16: } Chris@16: Chris@16: private: Chris@16: subiterator1_type it1_; Chris@16: subiterator2_type it2_; Chris@16: Chris@16: friend class const_iterator2; Chris@16: }; Chris@16: #endif Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator2 begin2 () { Chris@16: return find2 (0, 0, 0); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator2 end2 () { Chris@16: return find2 (0, 0, size2 ()); Chris@16: } Chris@16: Chris@16: // Reverse iterators Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reverse_iterator1 rbegin1 () const { Chris@16: return const_reverse_iterator1 (end1 ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@101: const_reverse_iterator1 crbegin1 () const { Chris@101: return rbegin1 (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@16: const_reverse_iterator1 rend1 () const { Chris@16: return const_reverse_iterator1 (begin1 ()); Chris@16: } Chris@101: BOOST_UBLAS_INLINE Chris@101: const_reverse_iterator1 crend1 () const { Chris@101: return rend1 (); Chris@101: } Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: reverse_iterator1 rbegin1 () { Chris@16: return reverse_iterator1 (end1 ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reverse_iterator1 rend1 () { Chris@16: return reverse_iterator1 (begin1 ()); Chris@16: } Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reverse_iterator2 rbegin2 () const { Chris@16: return const_reverse_iterator2 (end2 ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@101: const_reverse_iterator2 crbegin2 () const { Chris@101: return rbegin2 (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@16: const_reverse_iterator2 rend2 () const { Chris@16: return const_reverse_iterator2 (begin2 ()); Chris@16: } Chris@101: BOOST_UBLAS_INLINE Chris@101: const_reverse_iterator2 crend2 () const { Chris@101: return rend2 (); Chris@101: } Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: reverse_iterator2 rbegin2 () { Chris@16: return reverse_iterator2 (end2 ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reverse_iterator2 rend2 () { Chris@16: return reverse_iterator2 (begin2 ()); Chris@16: } Chris@16: Chris@16: private: Chris@16: matrix_closure_type data_; Chris@16: slice_type s1_; Chris@16: slice_type s2_; Chris@16: }; Chris@16: Chris@16: // Simple Projections Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_slice subslice (M &data, typename M::size_type start1, typename M::difference_type stride1, typename M::size_type size1, typename M::size_type start2, typename M::difference_type stride2, typename M::size_type size2) { Chris@16: typedef basic_slice slice_type; Chris@16: return matrix_slice (data, slice_type (start1, stride1, size1), slice_type (start2, stride2, size2)); Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_slice subslice (const M &data, typename M::size_type start1, typename M::difference_type stride1, typename M::size_type size1, typename M::size_type start2, typename M::difference_type stride2, typename M::size_type size2) { Chris@16: typedef basic_slice slice_type; Chris@16: return matrix_slice (data, slice_type (start1, stride1, size1), slice_type (start2, stride2, size2)); Chris@16: } Chris@16: Chris@16: // Generic Projections Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_slice project (M &data, const typename matrix_slice::slice_type &s1, const typename matrix_slice::slice_type &s2) { Chris@16: return matrix_slice (data, s1, s2); Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: const matrix_slice project (const M &data, const typename matrix_slice::slice_type &s1, const typename matrix_slice::slice_type &s2) { Chris@16: // ISSUE was: return matrix_slice (const_cast (data), s1, s2); Chris@16: return matrix_slice (data, s1, s2); Chris@16: } Chris@16: // ISSUE in the following two functions it would be logical to use matrix_slice::range_type but this confuses VC7.1 and 8.0 Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_slice project (matrix_slice &data, const typename matrix_range::range_type &r1, const typename matrix_range::range_type &r2) { Chris@16: return data.project (r1, r2); Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: const matrix_slice project (const matrix_slice &data, const typename matrix_range::range_type &r1, const typename matrix_range::range_type &r2) { Chris@16: return data.project (r1, r2); Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_slice project (matrix_slice &data, const typename matrix_slice::slice_type &s1, const typename matrix_slice::slice_type &s2) { Chris@16: return data.project (s1, s2); Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: const matrix_slice project (const matrix_slice &data, const typename matrix_slice::slice_type &s1, const typename matrix_slice::slice_type &s2) { Chris@16: return data.project (s1, s2); Chris@16: } Chris@16: Chris@16: // Specialization of temporary_traits Chris@16: template Chris@16: struct matrix_temporary_traits< matrix_slice > Chris@16: : matrix_temporary_traits< M > {}; Chris@16: template Chris@16: struct matrix_temporary_traits< const matrix_slice > Chris@16: : matrix_temporary_traits< M > {}; Chris@16: Chris@16: template Chris@16: struct vector_temporary_traits< matrix_slice > Chris@16: : vector_temporary_traits< M > {}; Chris@16: template Chris@16: struct vector_temporary_traits< const matrix_slice > Chris@16: : vector_temporary_traits< M > {}; Chris@16: Chris@16: // Matrix based indirection class Chris@16: // Contributed by Toon Knapen. Chris@16: // Extended and optimized by Kresimir Fresl. Chris@16: /** \brief A matrix referencing a non continuous submatrix of elements given another matrix of indices. Chris@16: * Chris@16: * It is the most general version of any submatrices because it uses another matrix of indices to reference Chris@16: * the submatrix. Chris@16: * Chris@16: * The matrix of indices can be of any type with the restriction that its elements must be Chris@16: * type-compatible with the size_type \c of the container. In practice, the following are good candidates: Chris@16: * - \c boost::numeric::ublas::indirect_array where \c A can be \c int, \c size_t, \c long, etc... Chris@16: * - \c boost::numeric::ublas::matrix can work too (\c int can be replaced by another integer type) Chris@16: * - etc... Chris@16: * Chris@16: * An indirect matrix can be used as a normal matrix in any expression. If the specified indirect matrix Chris@16: * falls outside that of the indices of the matrix, then the \c matrix_indirect is not a well formed Chris@16: * \i Matrix \i Expression and access to an element outside of indices of the matrix is \b undefined. Chris@16: * Chris@16: * \tparam V the type of the referenced matrix, for example \c matrix) Chris@16: * \tparam IA the type of index matrix. Default is \c ublas::indirect_array<> Chris@16: */ Chris@16: template Chris@16: class matrix_indirect: Chris@16: public matrix_expression > { Chris@16: Chris@16: typedef matrix_indirect self_type; Chris@16: public: Chris@16: #ifdef BOOST_UBLAS_ENABLE_PROXY_SHORTCUTS Chris@16: using matrix_expression::operator (); Chris@16: #endif Chris@16: typedef M matrix_type; Chris@16: typedef IA indirect_array_type; Chris@16: typedef typename M::size_type size_type; Chris@16: typedef typename M::difference_type difference_type; Chris@16: typedef typename M::value_type value_type; Chris@16: typedef typename M::const_reference const_reference; Chris@16: typedef typename boost::mpl::if_, Chris@16: typename M::const_reference, Chris@16: typename M::reference>::type reference; Chris@16: typedef typename boost::mpl::if_, Chris@16: typename M::const_closure_type, Chris@16: typename M::closure_type>::type matrix_closure_type; Chris@16: typedef basic_range range_type; Chris@16: typedef basic_slice slice_type; Chris@16: typedef const self_type const_closure_type; Chris@16: typedef self_type closure_type; Chris@16: typedef typename storage_restrict_traits::storage_category storage_category; Chris@16: typedef typename M::orientation_category orientation_category; Chris@16: Chris@16: // Construction and destruction Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_indirect (matrix_type &data, size_type size1, size_type size2): Chris@16: data_ (data), ia1_ (size1), ia2_ (size2) {} Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_indirect (matrix_type &data, const indirect_array_type &ia1, const indirect_array_type &ia2): Chris@16: data_ (data), ia1_ (ia1.preprocess (data.size1 ())), ia2_ (ia2.preprocess (data.size2 ())) {} Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_indirect (const matrix_closure_type &data, const indirect_array_type &ia1, const indirect_array_type &ia2, int): Chris@16: data_ (data), ia1_ (ia1.preprocess (data.size1 ())), ia2_ (ia2.preprocess (data.size2 ())) {} Chris@16: Chris@16: // Accessors Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type size1 () const { Chris@16: return ia1_.size (); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type size2 () const { Chris@16: return ia2_.size (); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const indirect_array_type &indirect1 () const { Chris@16: return ia1_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: indirect_array_type &indirect1 () { Chris@16: return ia1_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const indirect_array_type &indirect2 () const { Chris@16: return ia2_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: indirect_array_type &indirect2 () { Chris@16: return ia2_; Chris@16: } Chris@16: Chris@16: // Storage accessors Chris@16: BOOST_UBLAS_INLINE Chris@16: const matrix_closure_type &data () const { Chris@16: return data_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_closure_type &data () { Chris@16: return data_; Chris@16: } Chris@16: Chris@16: // Element access Chris@16: #ifndef BOOST_UBLAS_PROXY_CONST_MEMBER Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator () (size_type i, size_type j) const { Chris@16: return data_ (ia1_ (i), ia2_ (j)); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator () (size_type i, size_type j) { Chris@16: return data_ (ia1_ (i), ia2_ (j)); Chris@16: } Chris@16: #else Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator () (size_type i, size_type j) const { Chris@16: return data_ (ia1_ (i), ia2_ (j)); Chris@16: } Chris@16: #endif Chris@16: Chris@16: // ISSUE can this be done in free project function? Chris@16: // Although a const function can create a non-const proxy to a non-const object Chris@16: // Critical is that matrix_type and data_ (vector_closure_type) are const correct Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_indirect project (const range_type &r1, const range_type &r2) const { Chris@16: return matrix_indirect (data_, ia1_.compose (r1.preprocess (data_.size1 ())), ia2_.compose (r2.preprocess (data_.size2 ())), 0); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_indirect project (const slice_type &s1, const slice_type &s2) const { Chris@16: return matrix_indirect (data_, ia1_.compose (s1.preprocess (data_.size1 ())), ia2_.compose (s2.preprocess (data_.size2 ())), 0); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_indirect project (const indirect_array_type &ia1, const indirect_array_type &ia2) const { Chris@16: return matrix_indirect (data_, ia1_.compose (ia1.preprocess (data_.size1 ())), ia2_.compose (ia2.preprocess (data_.size2 ())), 0); Chris@16: } Chris@16: Chris@16: // Assignment Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_indirect &operator = (const matrix_indirect &mi) { Chris@16: matrix_assign (*this, mi); Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_indirect &assign_temporary (matrix_indirect &mi) { Chris@16: return *this = mi; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_indirect &operator = (const matrix_expression &ae) { Chris@16: matrix_assign (*this, typename matrix_temporary_traits::type (ae)); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_indirect &assign (const matrix_expression &ae) { Chris@16: matrix_assign (*this, ae); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_indirect& operator += (const matrix_expression &ae) { Chris@16: matrix_assign (*this, typename matrix_temporary_traits::type (*this + ae)); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_indirect &plus_assign (const matrix_expression &ae) { Chris@16: matrix_assign (*this, ae); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_indirect& operator -= (const matrix_expression &ae) { Chris@16: matrix_assign (*this, typename matrix_temporary_traits::type (*this - ae)); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_indirect &minus_assign (const matrix_expression &ae) { Chris@16: matrix_assign (*this, ae); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_indirect& operator *= (const AT &at) { Chris@16: matrix_assign_scalar (*this, at); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_indirect& operator /= (const AT &at) { Chris@16: matrix_assign_scalar (*this, at); Chris@16: return *this; Chris@16: } Chris@16: Chris@16: // Closure comparison Chris@16: BOOST_UBLAS_INLINE Chris@16: bool same_closure (const matrix_indirect &mi) const { Chris@16: return (*this).data_.same_closure (mi.data_); Chris@16: } Chris@16: Chris@16: // Comparison Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator == (const matrix_indirect &mi) const { Chris@16: return (*this).data_ == mi.data_ && ia1_ == mi.ia1_ && ia2_ == mi.ia2_; Chris@16: } Chris@16: Chris@16: // Swapping Chris@16: BOOST_UBLAS_INLINE Chris@16: void swap (matrix_indirect mi) { Chris@16: if (this != &mi) { Chris@16: BOOST_UBLAS_CHECK (size1 () == mi.size1 (), bad_size ()); Chris@16: BOOST_UBLAS_CHECK (size2 () == mi.size2 (), bad_size ()); Chris@16: matrix_swap (*this, mi); Chris@16: } Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: friend void swap (matrix_indirect mi1, matrix_indirect mi2) { Chris@16: mi1.swap (mi2); Chris@16: } Chris@16: Chris@16: // Iterator types Chris@16: private: Chris@16: typedef typename IA::const_iterator const_subiterator1_type; Chris@16: typedef typename IA::const_iterator subiterator1_type; Chris@16: typedef typename IA::const_iterator const_subiterator2_type; Chris@16: typedef typename IA::const_iterator subiterator2_type; Chris@16: Chris@16: public: Chris@16: #ifdef BOOST_UBLAS_USE_INDEXED_ITERATOR Chris@16: typedef indexed_iterator1, Chris@16: typename matrix_type::iterator1::iterator_category> iterator1; Chris@16: typedef indexed_iterator2, Chris@16: typename matrix_type::iterator2::iterator_category> iterator2; Chris@16: typedef indexed_const_iterator1, Chris@16: typename matrix_type::const_iterator1::iterator_category> const_iterator1; Chris@16: typedef indexed_const_iterator2, Chris@16: typename matrix_type::const_iterator2::iterator_category> const_iterator2; Chris@16: #else Chris@16: class const_iterator1; Chris@16: class iterator1; Chris@16: class const_iterator2; Chris@16: class iterator2; Chris@16: #endif Chris@16: typedef reverse_iterator_base1 const_reverse_iterator1; Chris@16: typedef reverse_iterator_base1 reverse_iterator1; Chris@16: typedef reverse_iterator_base2 const_reverse_iterator2; Chris@16: typedef reverse_iterator_base2 reverse_iterator2; Chris@16: Chris@16: // Element lookup Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator1 find1 (int /* rank */, size_type i, size_type j) const { Chris@16: #ifdef BOOST_UBLAS_USE_INDEXED_ITERATOR Chris@16: return const_iterator1 (*this, i, j); Chris@16: #else Chris@16: return const_iterator1 (*this, ia1_.begin () + i, ia2_.begin () + j); Chris@16: #endif Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator1 find1 (int /* rank */, size_type i, size_type j) { Chris@16: #ifdef BOOST_UBLAS_USE_INDEXED_ITERATOR Chris@16: return iterator1 (*this, i, j); Chris@16: #else Chris@16: return iterator1 (*this, ia1_.begin () + i, ia2_.begin () + j); Chris@16: #endif Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 find2 (int /* rank */, size_type i, size_type j) const { Chris@16: #ifdef BOOST_UBLAS_USE_INDEXED_ITERATOR Chris@16: return const_iterator2 (*this, i, j); Chris@16: #else Chris@16: return const_iterator2 (*this, ia1_.begin () + i, ia2_.begin () + j); Chris@16: #endif Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator2 find2 (int /* rank */, size_type i, size_type j) { Chris@16: #ifdef BOOST_UBLAS_USE_INDEXED_ITERATOR Chris@16: return iterator2 (*this, i, j); Chris@16: #else Chris@16: return iterator2 (*this, ia1_.begin () + i, ia2_.begin () + j); Chris@16: #endif Chris@16: } Chris@16: Chris@16: // Iterators simply are indices. Chris@16: Chris@16: #ifndef BOOST_UBLAS_USE_INDEXED_ITERATOR Chris@16: class const_iterator1: Chris@16: public container_const_reference, Chris@16: public iterator_base_traits::template Chris@16: iterator_base::type { Chris@16: public: Chris@16: typedef typename M::const_iterator1::value_type value_type; Chris@16: typedef typename M::const_iterator1::difference_type difference_type; Chris@16: typedef typename M::const_reference reference; //FIXME due to indexing access Chris@16: typedef typename M::const_iterator1::pointer pointer; Chris@16: typedef const_iterator2 dual_iterator_type; Chris@16: typedef const_reverse_iterator2 dual_reverse_iterator_type; Chris@16: Chris@16: // Construction and destruction Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator1 (): Chris@16: container_const_reference (), it1_ (), it2_ () {} Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator1 (const self_type &mi, const const_subiterator1_type &it1, const const_subiterator2_type &it2): Chris@16: container_const_reference (mi), it1_ (it1), it2_ (it2) {} Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator1 (const iterator1 &it): Chris@16: container_const_reference (it ()), it1_ (it.it1_), it2_ (it.it2_) {} Chris@16: Chris@16: // Arithmetic Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator1 &operator ++ () { Chris@16: ++ it1_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator1 &operator -- () { Chris@16: -- it1_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator1 &operator += (difference_type n) { Chris@16: it1_ += n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator1 &operator -= (difference_type n) { Chris@16: it1_ -= n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: difference_type operator - (const const_iterator1 &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: BOOST_UBLAS_CHECK (it2_ == it.it2_, external_logic ()); Chris@16: return it1_ - it.it1_; Chris@16: } Chris@16: Chris@16: // Dereference Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator * () const { Chris@16: // FIXME replace find with at_element Chris@16: return (*this) ().data_ (*it1_, *it2_); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator [] (difference_type n) const { Chris@16: return *(*this + n); Chris@16: } Chris@16: Chris@16: #ifndef BOOST_UBLAS_NO_NESTED_CLASS_RELATION Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@16: const_iterator2 begin () const { Chris@16: return const_iterator2 ((*this) (), it1_, it2_ ().begin ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@101: const_iterator2 cbegin () const { Chris@101: return begin (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@101: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@101: typename self_type:: Chris@101: #endif Chris@16: const_iterator2 end () const { Chris@16: return const_iterator2 ((*this) (), it1_, it2_ ().end ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@101: const_iterator2 cend () const { Chris@101: return end (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@101: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@101: typename self_type:: Chris@101: #endif Chris@16: const_reverse_iterator2 rbegin () const { Chris@16: return const_reverse_iterator2 (end ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@101: const_reverse_iterator2 crbegin () const { Chris@101: return rbegin (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@101: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@101: typename self_type:: Chris@101: #endif Chris@16: const_reverse_iterator2 rend () const { Chris@16: return const_reverse_iterator2 (begin ()); Chris@16: } Chris@101: BOOST_UBLAS_INLINE Chris@101: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@101: typename self_type:: Chris@101: #endif Chris@101: const_reverse_iterator2 crend () const { Chris@101: return rend (); Chris@101: } Chris@16: #endif Chris@16: Chris@16: // Indices Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index1 () const { Chris@16: return it1_.index (); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index2 () const { Chris@16: return it2_.index (); Chris@16: } Chris@16: Chris@16: // Assignment Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator1 &operator = (const const_iterator1 &it) { Chris@16: container_const_reference::assign (&it ()); Chris@16: it1_ = it.it1_; Chris@16: it2_ = it.it2_; Chris@16: return *this; Chris@16: } Chris@16: Chris@16: // Comparison Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator == (const const_iterator1 &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: BOOST_UBLAS_CHECK (it2_ == it.it2_, external_logic ()); Chris@16: return it1_ == it.it1_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator < (const const_iterator1 &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: BOOST_UBLAS_CHECK (it2_ == it.it2_, external_logic ()); Chris@16: return it1_ < it.it1_; Chris@16: } Chris@16: Chris@16: private: Chris@16: const_subiterator1_type it1_; Chris@16: const_subiterator2_type it2_; Chris@16: }; Chris@16: #endif Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator1 begin1 () const { Chris@16: return find1 (0, 0, 0); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@101: const_iterator1 cbegin1 () const { Chris@101: return begin1 (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@16: const_iterator1 end1 () const { Chris@16: return find1 (0, size1 (), 0); Chris@16: } Chris@101: BOOST_UBLAS_INLINE Chris@101: const_iterator1 cend1 () const { Chris@101: return end1 (); Chris@101: } Chris@16: Chris@16: #ifndef BOOST_UBLAS_USE_INDEXED_ITERATOR Chris@16: class iterator1: Chris@16: public container_reference, Chris@16: public iterator_base_traits::template Chris@16: iterator_base::type { Chris@16: public: Chris@16: typedef typename M::iterator1::value_type value_type; Chris@16: typedef typename M::iterator1::difference_type difference_type; Chris@16: typedef typename M::reference reference; //FIXME due to indexing access Chris@16: typedef typename M::iterator1::pointer pointer; Chris@16: typedef iterator2 dual_iterator_type; Chris@16: typedef reverse_iterator2 dual_reverse_iterator_type; Chris@16: Chris@16: // Construction and destruction Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator1 (): Chris@16: container_reference (), it1_ (), it2_ () {} Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator1 (self_type &mi, const subiterator1_type &it1, const subiterator2_type &it2): Chris@16: container_reference (mi), it1_ (it1), it2_ (it2) {} Chris@16: Chris@16: // Arithmetic Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator1 &operator ++ () { Chris@16: ++ it1_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator1 &operator -- () { Chris@16: -- it1_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator1 &operator += (difference_type n) { Chris@16: it1_ += n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator1 &operator -= (difference_type n) { Chris@16: it1_ -= n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: difference_type operator - (const iterator1 &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: BOOST_UBLAS_CHECK (it2_ == it.it2_, external_logic ()); Chris@16: return it1_ - it.it1_; Chris@16: } Chris@16: Chris@16: // Dereference Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator * () const { Chris@16: // FIXME replace find with at_element Chris@16: return (*this) ().data_ (*it1_, *it2_); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator [] (difference_type n) const { Chris@16: return *(*this + n); Chris@16: } Chris@16: Chris@16: #ifndef BOOST_UBLAS_NO_NESTED_CLASS_RELATION Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@16: iterator2 begin () const { Chris@16: return iterator2 ((*this) (), it1_, it2_ ().begin ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@16: iterator2 end () const { Chris@16: return iterator2 ((*this) (), it1_, it2_ ().end ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@16: reverse_iterator2 rbegin () const { Chris@16: return reverse_iterator2 (end ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@16: reverse_iterator2 rend () const { Chris@16: return reverse_iterator2 (begin ()); Chris@16: } Chris@16: #endif Chris@16: Chris@16: // Indices Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index1 () const { Chris@16: return it1_.index (); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index2 () const { Chris@16: return it2_.index (); Chris@16: } Chris@16: Chris@16: // Assignment Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator1 &operator = (const iterator1 &it) { Chris@16: container_reference::assign (&it ()); Chris@16: it1_ = it.it1_; Chris@16: it2_ = it.it2_; Chris@16: return *this; Chris@16: } Chris@16: Chris@16: // Comparison Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator == (const iterator1 &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: BOOST_UBLAS_CHECK (it2_ == it.it2_, external_logic ()); Chris@16: return it1_ == it.it1_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator < (const iterator1 &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: BOOST_UBLAS_CHECK (it2_ == it.it2_, external_logic ()); Chris@16: return it1_ < it.it1_; Chris@16: } Chris@16: Chris@16: private: Chris@16: subiterator1_type it1_; Chris@16: subiterator2_type it2_; Chris@16: Chris@16: friend class const_iterator1; Chris@16: }; Chris@16: #endif Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator1 begin1 () { Chris@16: return find1 (0, 0, 0); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator1 end1 () { Chris@16: return find1 (0, size1 (), 0); Chris@16: } Chris@16: Chris@16: #ifndef BOOST_UBLAS_USE_INDEXED_ITERATOR Chris@16: class const_iterator2: Chris@16: public container_const_reference, Chris@16: public iterator_base_traits::template Chris@16: iterator_base::type { Chris@16: public: Chris@16: typedef typename M::const_iterator2::value_type value_type; Chris@16: typedef typename M::const_iterator2::difference_type difference_type; Chris@16: typedef typename M::const_reference reference; //FIXME due to indexing access Chris@16: typedef typename M::const_iterator2::pointer pointer; Chris@16: typedef const_iterator1 dual_iterator_type; Chris@16: typedef const_reverse_iterator1 dual_reverse_iterator_type; Chris@16: Chris@16: // Construction and destruction Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 (): Chris@16: container_const_reference (), it1_ (), it2_ () {} Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 (const self_type &mi, const const_subiterator1_type &it1, const const_subiterator2_type &it2): Chris@16: container_const_reference (mi), it1_ (it1), it2_ (it2) {} Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 (const iterator2 &it): Chris@16: container_const_reference (it ()), it1_ (it.it1_), it2_ (it.it2_) {} Chris@16: Chris@16: // Arithmetic Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 &operator ++ () { Chris@16: ++ it2_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 &operator -- () { Chris@16: -- it2_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 &operator += (difference_type n) { Chris@16: it2_ += n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 &operator -= (difference_type n) { Chris@16: it2_ -= n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: difference_type operator - (const const_iterator2 &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: BOOST_UBLAS_CHECK (it1_ == it.it1_, external_logic ()); Chris@16: return it2_ - it.it2_; Chris@16: } Chris@16: Chris@16: // Dereference Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator * () const { Chris@16: // FIXME replace find with at_element Chris@16: return (*this) ().data_ (*it1_, *it2_); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator [] (difference_type n) const { Chris@16: return *(*this + n); Chris@16: } Chris@16: Chris@16: #ifndef BOOST_UBLAS_NO_NESTED_CLASS_RELATION Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@16: const_iterator1 begin () const { Chris@16: return const_iterator1 ((*this) (), it1_ ().begin (), it2_); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@101: const_iterator1 cbegin () const { Chris@101: return begin (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@101: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@101: typename self_type:: Chris@101: #endif Chris@16: const_iterator1 end () const { Chris@16: return const_iterator1 ((*this) (), it1_ ().end (), it2_); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@101: const_iterator1 cend () const { Chris@101: return end (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@101: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@101: typename self_type:: Chris@101: #endif Chris@16: const_reverse_iterator1 rbegin () const { Chris@16: return const_reverse_iterator1 (end ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@101: const_reverse_iterator1 crbegin () const { Chris@101: return rbegin (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@101: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@101: typename self_type:: Chris@101: #endif Chris@16: const_reverse_iterator1 rend () const { Chris@16: return const_reverse_iterator1 (begin ()); Chris@16: } Chris@101: BOOST_UBLAS_INLINE Chris@101: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@101: typename self_type:: Chris@101: #endif Chris@101: const_reverse_iterator1 crend () const { Chris@101: return rend (); Chris@101: } Chris@16: #endif Chris@16: Chris@16: // Indices Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index1 () const { Chris@16: return it1_.index (); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index2 () const { Chris@16: return it2_.index (); Chris@16: } Chris@16: Chris@16: // Assignment Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 &operator = (const const_iterator2 &it) { Chris@16: container_const_reference::assign (&it ()); Chris@16: it1_ = it.it1_; Chris@16: it2_ = it.it2_; Chris@16: return *this; Chris@16: } Chris@16: Chris@16: // Comparison Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator == (const const_iterator2 &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: BOOST_UBLAS_CHECK (it1_ == it.it1_, external_logic ()); Chris@16: return it2_ == it.it2_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator < (const const_iterator2 &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: BOOST_UBLAS_CHECK (it1_ == it.it1_, external_logic ()); Chris@16: return it2_ < it.it2_; Chris@16: } Chris@16: Chris@16: private: Chris@16: const_subiterator1_type it1_; Chris@16: const_subiterator2_type it2_; Chris@16: }; Chris@16: #endif Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 begin2 () const { Chris@16: return find2 (0, 0, 0); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@101: const_iterator2 cbegin2 () const { Chris@101: return begin2 (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@16: const_iterator2 end2 () const { Chris@16: return find2 (0, 0, size2 ()); Chris@16: } Chris@101: BOOST_UBLAS_INLINE Chris@101: const_iterator2 cend2 () const { Chris@101: return end2 (); Chris@101: } Chris@16: Chris@16: #ifndef BOOST_UBLAS_USE_INDEXED_ITERATOR Chris@16: class iterator2: Chris@16: public container_reference, Chris@16: public iterator_base_traits::template Chris@16: iterator_base::type { Chris@16: public: Chris@16: typedef typename M::iterator2::value_type value_type; Chris@16: typedef typename M::iterator2::difference_type difference_type; Chris@16: typedef typename M::reference reference; //FIXME due to indexing access Chris@16: typedef typename M::iterator2::pointer pointer; Chris@16: typedef iterator1 dual_iterator_type; Chris@16: typedef reverse_iterator1 dual_reverse_iterator_type; Chris@16: Chris@16: // Construction and destruction Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator2 (): Chris@16: container_reference (), it1_ (), it2_ () {} Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator2 (self_type &mi, const subiterator1_type &it1, const subiterator2_type &it2): Chris@16: container_reference (mi), it1_ (it1), it2_ (it2) {} Chris@16: Chris@16: // Arithmetic Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator2 &operator ++ () { Chris@16: ++ it2_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator2 &operator -- () { Chris@16: -- it2_; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator2 &operator += (difference_type n) { Chris@16: it2_ += n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator2 &operator -= (difference_type n) { Chris@16: it2_ -= n; Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: difference_type operator - (const iterator2 &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: BOOST_UBLAS_CHECK (it1_ == it.it1_, external_logic ()); Chris@16: return it2_ - it.it2_; Chris@16: } Chris@16: Chris@16: // Dereference Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator * () const { Chris@16: // FIXME replace find with at_element Chris@16: return (*this) ().data_ (*it1_, *it2_); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator [] (difference_type n) const { Chris@16: return *(*this + n); Chris@16: } Chris@16: Chris@16: #ifndef BOOST_UBLAS_NO_NESTED_CLASS_RELATION Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@16: iterator1 begin () const { Chris@16: return iterator1 ((*this) (), it1_ ().begin (), it2_); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@16: iterator1 end () const { Chris@16: return iterator1 ((*this) (), it1_ ().end (), it2_); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@16: reverse_iterator1 rbegin () const { Chris@16: return reverse_iterator1 (end ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION Chris@16: typename self_type:: Chris@16: #endif Chris@16: reverse_iterator1 rend () const { Chris@16: return reverse_iterator1 (begin ()); Chris@16: } Chris@16: #endif Chris@16: Chris@16: // Indices Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index1 () const { Chris@16: return it1_.index (); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index2 () const { Chris@16: return it2_.index (); Chris@16: } Chris@16: Chris@16: // Assignment Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator2 &operator = (const iterator2 &it) { Chris@16: container_reference::assign (&it ()); Chris@16: it1_ = it.it1_; Chris@16: it2_ = it.it2_; Chris@16: return *this; Chris@16: } Chris@16: Chris@16: // Comparison Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator == (const iterator2 &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: BOOST_UBLAS_CHECK (it1_ == it.it1_, external_logic ()); Chris@16: return it2_ == it.it2_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator < (const iterator2 &it) const { Chris@16: BOOST_UBLAS_CHECK ((*this) ().same_closure (it ()), external_logic ()); Chris@16: BOOST_UBLAS_CHECK (it1_ == it.it1_, external_logic ()); Chris@16: return it2_ < it.it2_; Chris@16: } Chris@16: Chris@16: private: Chris@16: subiterator1_type it1_; Chris@16: subiterator2_type it2_; Chris@16: Chris@16: friend class const_iterator2; Chris@16: }; Chris@16: #endif Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator2 begin2 () { Chris@16: return find2 (0, 0, 0); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator2 end2 () { Chris@16: return find2 (0, 0, size2 ()); Chris@16: } Chris@16: Chris@16: // Reverse iterators Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reverse_iterator1 rbegin1 () const { Chris@16: return const_reverse_iterator1 (end1 ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@101: const_reverse_iterator1 crbegin1 () const { Chris@101: return rbegin1 (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@16: const_reverse_iterator1 rend1 () const { Chris@16: return const_reverse_iterator1 (begin1 ()); Chris@16: } Chris@101: BOOST_UBLAS_INLINE Chris@101: const_reverse_iterator1 crend1 () const { Chris@101: return rend1 (); Chris@101: } Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: reverse_iterator1 rbegin1 () { Chris@16: return reverse_iterator1 (end1 ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reverse_iterator1 rend1 () { Chris@16: return reverse_iterator1 (begin1 ()); Chris@16: } Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reverse_iterator2 rbegin2 () const { Chris@16: return const_reverse_iterator2 (end2 ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@101: const_reverse_iterator2 crbegin2 () const { Chris@101: return rbegin2 (); Chris@101: } Chris@101: BOOST_UBLAS_INLINE Chris@16: const_reverse_iterator2 rend2 () const { Chris@16: return const_reverse_iterator2 (begin2 ()); Chris@16: } Chris@101: BOOST_UBLAS_INLINE Chris@101: const_reverse_iterator2 crend2 () const { Chris@101: return rend2 (); Chris@101: } Chris@16: Chris@16: BOOST_UBLAS_INLINE Chris@16: reverse_iterator2 rbegin2 () { Chris@16: return reverse_iterator2 (end2 ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reverse_iterator2 rend2 () { Chris@16: return reverse_iterator2 (begin2 ()); Chris@16: } Chris@16: Chris@16: private: Chris@16: matrix_closure_type data_; Chris@16: indirect_array_type ia1_; Chris@16: indirect_array_type ia2_; Chris@16: }; Chris@16: Chris@16: // Projections Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_indirect > project (M &data, const indirect_array &ia1, const indirect_array &ia2) { Chris@16: return matrix_indirect > (data, ia1, ia2); Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: const matrix_indirect > project (const M &data, const indirect_array &ia1, const indirect_array &ia2) { Chris@16: // ISSUE was: return matrix_indirect > (const_cast (data), ia1, ia2); Chris@16: return matrix_indirect > (data, ia1, ia2); Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_indirect project (matrix_indirect &data, const typename matrix_indirect::range_type &r1, const typename matrix_indirect::range_type &r2) { Chris@16: return data.project (r1, r2); Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: const matrix_indirect project (const matrix_indirect &data, const typename matrix_indirect::range_type &r1, const typename matrix_indirect::range_type &r2) { Chris@16: return data.project (r1, r2); Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_indirect project (matrix_indirect &data, const typename matrix_indirect::slice_type &s1, const typename matrix_indirect::slice_type &s2) { Chris@16: return data.project (s1, s2); Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: const matrix_indirect project (const matrix_indirect &data, const typename matrix_indirect::slice_type &s1, const typename matrix_indirect::slice_type &s2) { Chris@16: return data.project (s1, s2); Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: matrix_indirect > project (matrix_indirect > &data, const indirect_array &ia1, const indirect_array &ia2) { Chris@16: return data.project (ia1, ia2); Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: const matrix_indirect > project (const matrix_indirect > &data, const indirect_array &ia1, const indirect_array &ia2) { Chris@16: return data.project (ia1, ia2); Chris@16: } Chris@16: Chris@16: /// Specialization of temporary_traits Chris@16: template Chris@16: struct matrix_temporary_traits< matrix_indirect > Chris@16: : matrix_temporary_traits< M > {}; Chris@16: template Chris@16: struct matrix_temporary_traits< const matrix_indirect > Chris@16: : matrix_temporary_traits< M > {}; Chris@16: Chris@16: template Chris@16: struct vector_temporary_traits< matrix_indirect > Chris@16: : vector_temporary_traits< M > {}; Chris@16: template Chris@16: struct vector_temporary_traits< const matrix_indirect > Chris@16: : vector_temporary_traits< M > {}; Chris@16: Chris@16: }}} Chris@16: Chris@16: #endif