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_SYMMETRIC_ Chris@16: #define _BOOST_UBLAS_SYMMETRIC_ Chris@16: Chris@16: #include Chris@16: #include Chris@16: #include Chris@16: Chris@16: // Iterators based on ideas of Jeremy Siek Chris@16: // Symmetric matrices are square. Thanks to Peter Schmitteckert for spotting this. Chris@16: Chris@16: namespace boost { namespace numeric { namespace ublas { Chris@16: Chris@16: template Chris@16: bool is_symmetric (const M &m) { Chris@16: typedef typename M::size_type size_type; Chris@16: Chris@16: if (m.size1 () != m.size2 ()) Chris@16: return false; Chris@16: size_type size = BOOST_UBLAS_SAME (m.size1 (), m.size2 ()); Chris@16: for (size_type i = 0; i < size; ++ i) { Chris@16: for (size_type j = i; j < size; ++ j) { Chris@16: if (m (i, j) != m (j, i)) Chris@16: return false; Chris@16: } Chris@16: } Chris@16: return true; Chris@16: } Chris@16: Chris@16: // Array based symmetric matrix class Chris@16: template Chris@16: class symmetric_matrix: Chris@16: public matrix_container > { Chris@16: Chris@16: typedef T *pointer; Chris@16: typedef TRI triangular_type; Chris@16: typedef L layout_type; Chris@16: typedef symmetric_matrix self_type; Chris@16: public: Chris@16: #ifdef BOOST_UBLAS_ENABLE_PROXY_SHORTCUTS Chris@16: using matrix_container::operator (); Chris@16: #endif Chris@16: typedef typename A::size_type size_type; Chris@16: typedef typename A::difference_type difference_type; Chris@16: typedef T value_type; Chris@16: typedef const T &const_reference; Chris@16: typedef T &reference; Chris@16: typedef A array_type; Chris@16: Chris@16: typedef const matrix_reference const_closure_type; Chris@16: typedef matrix_reference closure_type; Chris@16: typedef vector vector_temporary_type; Chris@16: typedef matrix matrix_temporary_type; // general sub-matrix Chris@16: typedef packed_tag storage_category; Chris@16: typedef typename L::orientation_category orientation_category; Chris@16: Chris@16: // Construction and destruction Chris@16: BOOST_UBLAS_INLINE Chris@16: symmetric_matrix (): Chris@16: matrix_container (), Chris@16: size_ (0), data_ (0) {} Chris@16: BOOST_UBLAS_INLINE Chris@16: symmetric_matrix (size_type size): Chris@16: matrix_container (), Chris@16: size_ (BOOST_UBLAS_SAME (size, size)), data_ (triangular_type::packed_size (layout_type (), size, size)) { Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: symmetric_matrix (size_type size1, size_type size2): Chris@16: matrix_container (), Chris@16: size_ (BOOST_UBLAS_SAME (size1, size2)), data_ (triangular_type::packed_size (layout_type (), size1, size2)) { Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: symmetric_matrix (size_type size, const array_type &data): Chris@16: matrix_container (), Chris@16: size_ (size), data_ (data) {} Chris@16: BOOST_UBLAS_INLINE Chris@16: symmetric_matrix (const symmetric_matrix &m): Chris@16: matrix_container (), Chris@16: size_ (m.size_), data_ (m.data_) {} Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: symmetric_matrix (const matrix_expression &ae): Chris@16: matrix_container (), Chris@16: size_ (BOOST_UBLAS_SAME (ae ().size1 (), ae ().size2 ())), Chris@16: data_ (triangular_type::packed_size (layout_type (), size_, size_)) { Chris@16: matrix_assign (*this, ae); Chris@16: } Chris@16: Chris@16: // Accessors Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type size1 () const { Chris@16: return size_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type size2 () const { Chris@16: return size_; Chris@16: } Chris@16: Chris@16: // Storage accessors Chris@16: BOOST_UBLAS_INLINE Chris@16: const array_type &data () const { Chris@16: return data_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: array_type &data () { Chris@16: return data_; Chris@16: } Chris@16: Chris@16: // Resizing Chris@16: BOOST_UBLAS_INLINE Chris@16: void resize (size_type size, bool preserve = true) { Chris@16: if (preserve) { Chris@16: self_type temporary (size, size); Chris@16: detail::matrix_resize_preserve (*this, temporary); Chris@16: } Chris@16: else { Chris@16: data ().resize (triangular_type::packed_size (layout_type (), size, size)); Chris@16: size_ = size; Chris@16: } Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: void resize (size_type size1, size_type size2, bool preserve = true) { Chris@16: resize (BOOST_UBLAS_SAME (size1, size2), preserve); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: void resize_packed_preserve (size_type size) { Chris@16: size_ = BOOST_UBLAS_SAME (size, size); Chris@16: data ().resize (triangular_type::packed_size (layout_type (), size_, size_), value_type ()); Chris@16: } Chris@16: Chris@16: // Element access Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator () (size_type i, size_type j) const { Chris@16: BOOST_UBLAS_CHECK (i < size_, bad_index ()); Chris@16: BOOST_UBLAS_CHECK (j < size_, bad_index ()); Chris@16: if (triangular_type::other (i, j)) Chris@16: return data () [triangular_type::element (layout_type (), i, size_, j, size_)]; Chris@16: else Chris@16: return data () [triangular_type::element (layout_type (), j, size_, i, size_)]; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reference at_element (size_type i, size_type j) { Chris@16: BOOST_UBLAS_CHECK (i < size_, bad_index ()); Chris@16: BOOST_UBLAS_CHECK (j < size_, bad_index ()); Chris@16: return data () [triangular_type::element (layout_type (), i, size_, j, size_)]; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator () (size_type i, size_type j) { Chris@16: BOOST_UBLAS_CHECK (i < size_, bad_index ()); Chris@16: BOOST_UBLAS_CHECK (j < size_, bad_index ()); Chris@16: if (triangular_type::other (i, j)) Chris@16: return data () [triangular_type::element (layout_type (), i, size_, j, size_)]; Chris@16: else Chris@16: return data () [triangular_type::element (layout_type (), j, size_, i, size_)]; Chris@16: } Chris@16: Chris@16: // Element assignment Chris@16: BOOST_UBLAS_INLINE Chris@16: reference insert_element (size_type i, size_type j, const_reference t) { Chris@16: return (operator () (i, j) = t); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: void erase_element (size_type i, size_type j) { Chris@16: operator () (i, j) = value_type/*zero*/(); Chris@16: } Chris@16: Chris@16: // Zeroing Chris@16: BOOST_UBLAS_INLINE Chris@16: void clear () { Chris@16: // data ().clear (); Chris@16: std::fill (data ().begin (), data ().end (), value_type/*zero*/()); Chris@16: } Chris@16: Chris@16: // Assignment Chris@16: BOOST_UBLAS_INLINE Chris@16: symmetric_matrix &operator = (const symmetric_matrix &m) { Chris@16: size_ = m.size_; Chris@16: data () = m.data (); Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: symmetric_matrix &assign_temporary (symmetric_matrix &m) { Chris@16: swap (m); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: symmetric_matrix &operator = (const matrix_expression &ae) { Chris@16: self_type temporary (ae); Chris@16: return assign_temporary (temporary); Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: symmetric_matrix &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: symmetric_matrix& operator += (const matrix_expression &ae) { Chris@16: self_type temporary (*this + ae); Chris@16: return assign_temporary (temporary); Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: symmetric_matrix &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: symmetric_matrix& operator -= (const matrix_expression &ae) { Chris@16: self_type temporary (*this - ae); Chris@16: return assign_temporary (temporary); Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: symmetric_matrix &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: symmetric_matrix& 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: symmetric_matrix& operator /= (const AT &at) { Chris@16: matrix_assign_scalar (*this, at); Chris@16: return *this; Chris@16: } Chris@16: Chris@16: // Swapping Chris@16: BOOST_UBLAS_INLINE Chris@16: void swap (symmetric_matrix &m) { Chris@16: if (this != &m) { Chris@16: std::swap (size_, m.size_); Chris@16: data ().swap (m.data ()); Chris@16: } Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: friend void swap (symmetric_matrix &m1, symmetric_matrix &m2) { Chris@16: m1.swap (m2); Chris@16: } Chris@16: Chris@16: // Iterator types Chris@16: #ifdef BOOST_UBLAS_USE_INDEXED_ITERATOR Chris@16: typedef indexed_iterator1 iterator1; Chris@16: typedef indexed_iterator2 iterator2; Chris@16: typedef indexed_const_iterator1 const_iterator1; Chris@16: typedef indexed_const_iterator2 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: return const_iterator1 (*this, i, j); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator1 find1 (int rank, size_type i, size_type j) { Chris@16: if (rank == 1) Chris@16: i = triangular_type::mutable_restrict1 (i, j, size1(), size2()); Chris@16: if (rank == 0) Chris@16: i = triangular_type::global_mutable_restrict1 (i, size1(), j, size2()); Chris@16: return iterator1 (*this, i, j); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 find2 (int /* rank */, size_type i, size_type j) const { Chris@16: return const_iterator2 (*this, i, j); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator2 find2 (int rank, size_type i, size_type j) { Chris@16: if (rank == 1) Chris@16: j = triangular_type::mutable_restrict2 (i, j, size1(), size2()); Chris@16: if (rank == 0) Chris@16: j = triangular_type::global_mutable_restrict2 (i, size1(), j, size2()); Chris@16: return iterator2 (*this, i, j); 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 random_access_iterator_base { Chris@16: public: Chris@16: typedef typename symmetric_matrix::value_type value_type; Chris@16: typedef typename symmetric_matrix::difference_type difference_type; Chris@16: typedef typename symmetric_matrix::const_reference reference; Chris@16: typedef const typename symmetric_matrix::pointer pointer; Chris@16: 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 &m, size_type it1, size_type it2): Chris@16: container_const_reference (m), 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) () == &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: return (*this) () (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 (*this) ().find2 (1, it1_, 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: return (*this) ().find2 (1, it1_, (*this) ().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 it1_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index2 () const { Chris@16: return it2_; 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) () == &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) () == &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: size_type it1_; Chris@16: size_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, size_, 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 random_access_iterator_base { Chris@16: public: Chris@16: typedef typename symmetric_matrix::value_type value_type; Chris@16: typedef typename symmetric_matrix::difference_type difference_type; Chris@16: typedef typename symmetric_matrix::reference reference; Chris@16: typedef typename symmetric_matrix::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 &m, size_type it1, size_type it2): Chris@16: container_reference (m), 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) () == &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: return (*this) () (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 (*this) ().find2 (1, it1_, 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: return (*this) ().find2 (1, it1_, (*this) ().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 it1_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index2 () const { Chris@16: return it2_; 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) () == &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) () == &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: size_type it1_; Chris@16: size_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, size_, 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 random_access_iterator_base { Chris@16: public: Chris@16: typedef typename symmetric_matrix::value_type value_type; Chris@16: typedef typename symmetric_matrix::difference_type difference_type; Chris@16: typedef typename symmetric_matrix::const_reference reference; Chris@16: typedef const typename symmetric_matrix::pointer pointer; Chris@16: 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 &m, size_type it1, size_type it2): Chris@16: container_const_reference (m), 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) () == &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: return (*this) () (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 (*this) ().find1 (1, 0, 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 (*this) ().find1 (1, (*this) ().size1 (), 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_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index2 () const { Chris@16: return it2_; 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) () == &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) () == &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: size_type it1_; Chris@16: size_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, size_); 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 random_access_iterator_base { Chris@16: public: Chris@16: typedef typename symmetric_matrix::value_type value_type; Chris@16: typedef typename symmetric_matrix::difference_type difference_type; Chris@16: typedef typename symmetric_matrix::reference reference; Chris@16: typedef typename symmetric_matrix::pointer pointer; Chris@16: 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 &m, size_type it1, size_type it2): Chris@16: container_reference (m), 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) () == &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: return (*this) () (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 (*this) ().find1 (1, 0, 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 (*this) ().find1 (1, (*this) ().size1 (), 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_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index2 () const { Chris@16: return it2_; 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) () == &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) () == &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: size_type it1_; Chris@16: size_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, size_); 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: 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: size_type size_; Chris@16: array_type data_; Chris@16: }; Chris@16: Chris@16: Chris@16: // Symmetric matrix adaptor class Chris@16: template Chris@16: class symmetric_adaptor: Chris@16: public matrix_expression > { Chris@16: Chris@16: typedef symmetric_adaptor 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 const M const_matrix_type; Chris@16: typedef M matrix_type; Chris@16: typedef TRI triangular_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: // Replaced by _temporary_traits to avoid type requirements on M Chris@16: //typedef typename M::vector_temporary_type vector_temporary_type; Chris@16: //typedef typename M::matrix_temporary_type matrix_temporary_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: symmetric_adaptor (matrix_type &data): Chris@16: matrix_expression (), Chris@16: data_ (data) { Chris@16: BOOST_UBLAS_CHECK (data_.size1 () == data_.size2 (), bad_size ()); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: symmetric_adaptor (const symmetric_adaptor &m): Chris@16: matrix_expression (), Chris@16: data_ (m.data_) { Chris@16: BOOST_UBLAS_CHECK (data_.size1 () == data_.size2 (), bad_size ()); Chris@16: } Chris@16: Chris@16: // Accessors Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type size1 () const { Chris@16: return data_.size1 (); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type size2 () const { Chris@16: return data_.size2 (); 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: BOOST_UBLAS_CHECK (i < size1 (), bad_index ()); Chris@16: BOOST_UBLAS_CHECK (j < size2 (), bad_index ()); Chris@16: if (triangular_type::other (i, j)) Chris@16: return data () (i, j); Chris@16: else Chris@16: return data () (j, i); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator () (size_type i, size_type j) { Chris@16: BOOST_UBLAS_CHECK (i < size1 (), bad_index ()); Chris@16: BOOST_UBLAS_CHECK (j < size2 (), bad_index ()); Chris@16: if (triangular_type::other (i, j)) Chris@16: return data () (i, j); Chris@16: else Chris@16: return data () (j, i); Chris@16: } Chris@16: #else Chris@16: BOOST_UBLAS_INLINE Chris@16: reference operator () (size_type i, size_type j) const { Chris@16: BOOST_UBLAS_CHECK (i < size1 (), bad_index ()); Chris@16: BOOST_UBLAS_CHECK (j < size2 (), bad_index ()); Chris@16: if (triangular_type::other (i, j)) Chris@16: return data () (i, j); Chris@16: else Chris@16: return data () (j, i); Chris@16: } Chris@16: #endif Chris@16: Chris@16: // Assignment Chris@16: BOOST_UBLAS_INLINE Chris@16: symmetric_adaptor &operator = (const symmetric_adaptor &m) { Chris@16: matrix_assign (*this, m); Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: symmetric_adaptor &assign_temporary (symmetric_adaptor &m) { Chris@16: *this = m; Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: symmetric_adaptor &operator = (const matrix_expression &ae) { Chris@16: matrix_assign (*this, matrix (ae)); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: symmetric_adaptor &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: symmetric_adaptor& operator += (const matrix_expression &ae) { Chris@16: matrix_assign (*this, matrix (*this + ae)); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: symmetric_adaptor &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: symmetric_adaptor& operator -= (const matrix_expression &ae) { Chris@16: matrix_assign (*this, matrix (*this - ae)); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: symmetric_adaptor &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: symmetric_adaptor& 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: symmetric_adaptor& 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 symmetric_adaptor &sa) const { Chris@16: return (*this).data ().same_closure (sa.data ()); Chris@16: } Chris@16: Chris@16: // Swapping Chris@16: BOOST_UBLAS_INLINE Chris@16: void swap (symmetric_adaptor &m) { Chris@16: if (this != &m) Chris@16: matrix_swap (*this, m); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: friend void swap (symmetric_adaptor &m1, symmetric_adaptor &m2) { Chris@16: m1.swap (m2); Chris@16: } Chris@16: Chris@16: // Iterator types Chris@16: private: Chris@16: // Use matrix iterator 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 iterator1; Chris@16: typedef indexed_iterator2 iterator2; Chris@16: typedef indexed_const_iterator1 const_iterator1; Chris@16: typedef indexed_const_iterator2 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: if (triangular_type::other (i, j)) { Chris@16: if (triangular_type::other (size1 (), j)) { Chris@16: return const_iterator1 (*this, 0, 0, Chris@16: data ().find1 (rank, i, j), data ().find1 (rank, size1 (), j), Chris@16: data ().find2 (rank, size2 (), size1 ()), data ().find2 (rank, size2 (), size1 ())); Chris@16: } else { Chris@16: return const_iterator1 (*this, 0, 1, Chris@16: data ().find1 (rank, i, j), data ().find1 (rank, j, j), Chris@16: data ().find2 (rank, j, j), data ().find2 (rank, j, size1 ())); Chris@16: } Chris@16: } else { Chris@16: if (triangular_type::other (size1 (), j)) { Chris@16: return const_iterator1 (*this, 1, 0, Chris@16: data ().find1 (rank, j, j), data ().find1 (rank, size1 (), j), Chris@16: data ().find2 (rank, j, i), data ().find2 (rank, j, j)); Chris@16: } else { Chris@16: return const_iterator1 (*this, 1, 1, Chris@16: data ().find1 (rank, size1 (), size2 ()), data ().find1 (rank, size1 (), size2 ()), Chris@16: data ().find2 (rank, j, i), data ().find2 (rank, j, size1 ())); Chris@16: } Chris@16: } Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator1 find1 (int rank, size_type i, size_type j) { Chris@16: if (rank == 1) Chris@16: i = triangular_type::mutable_restrict1 (i, j, size1(), size2()); Chris@16: return iterator1 (*this, data ().find1 (rank, i, j)); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 find2 (int rank, size_type i, size_type j) const { Chris@16: if (triangular_type::other (i, j)) { Chris@16: if (triangular_type::other (i, size2 ())) { Chris@16: return const_iterator2 (*this, 1, 1, Chris@16: data ().find1 (rank, size2 (), size1 ()), data ().find1 (rank, size2 (), size1 ()), Chris@16: data ().find2 (rank, i, j), data ().find2 (rank, i, size2 ())); Chris@16: } else { Chris@16: return const_iterator2 (*this, 1, 0, Chris@16: data ().find1 (rank, i, i), data ().find1 (rank, size2 (), i), Chris@16: data ().find2 (rank, i, j), data ().find2 (rank, i, i)); Chris@16: } Chris@16: } else { Chris@16: if (triangular_type::other (i, size2 ())) { Chris@16: return const_iterator2 (*this, 0, 1, Chris@16: data ().find1 (rank, j, i), data ().find1 (rank, i, i), Chris@16: data ().find2 (rank, i, i), data ().find2 (rank, i, size2 ())); Chris@16: } else { Chris@16: return const_iterator2 (*this, 0, 0, Chris@16: data ().find1 (rank, j, i), data ().find1 (rank, size2 (), i), Chris@16: data ().find2 (rank, size1 (), size2 ()), data ().find2 (rank, size2 (), size2 ())); Chris@16: } Chris@16: } Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator2 find2 (int rank, size_type i, size_type j) { Chris@16: if (rank == 1) Chris@16: j = triangular_type::mutable_restrict2 (i, j, size1(), size2()); Chris@16: return iterator2 (*this, data ().find2 (rank, i, j)); 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 random_access_iterator_base::iterator_category, Chris@16: const_iterator1, value_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: 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 (), Chris@16: begin_ (-1), end_ (-1), current_ (-1), Chris@16: it1_begin_ (), it1_end_ (), it1_ (), Chris@16: it2_begin_ (), it2_end_ (), it2_ () {} Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator1 (const self_type &m, int begin, int end, Chris@16: const const_subiterator1_type &it1_begin, const const_subiterator1_type &it1_end, Chris@16: const const_subiterator2_type &it2_begin, const const_subiterator2_type &it2_end): Chris@16: container_const_reference (m), Chris@16: begin_ (begin), end_ (end), current_ (begin), Chris@16: it1_begin_ (it1_begin), it1_end_ (it1_end), it1_ (it1_begin_), Chris@16: it2_begin_ (it2_begin), it2_end_ (it2_end), it2_ (it2_begin_) { Chris@16: if (current_ == 0 && it1_ == it1_end_) Chris@16: current_ = 1; Chris@16: if (current_ == 1 && it2_ == it2_end_) Chris@16: current_ = 0; Chris@16: if ((current_ == 0 && it1_ == it1_end_) || Chris@16: (current_ == 1 && it2_ == it2_end_)) Chris@16: current_ = end_; Chris@16: BOOST_UBLAS_CHECK (current_ == end_ || Chris@16: (current_ == 0 && it1_ != it1_end_) || Chris@16: (current_ == 1 && it2_ != it2_end_), internal_logic ()); Chris@16: } Chris@16: // FIXME cannot compile Chris@16: // iterator1 does not have these members! Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator1 (const iterator1 &it): Chris@16: container_const_reference (it ()), Chris@16: begin_ (it.begin_), end_ (it.end_), current_ (it.current_), Chris@16: it1_begin_ (it.it1_begin_), it1_end_ (it.it1_end_), it1_ (it.it1_), Chris@16: it2_begin_ (it.it2_begin_), it2_end_ (it.it2_end_), it2_ (it.it2_) { Chris@16: BOOST_UBLAS_CHECK (current_ == end_ || Chris@16: (current_ == 0 && it1_ != it1_end_) || Chris@16: (current_ == 1 && it2_ != it2_end_), internal_logic ()); Chris@16: } Chris@16: Chris@16: // Arithmetic Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator1 &operator ++ () { Chris@16: BOOST_UBLAS_CHECK (current_ == 0 || current_ == 1, internal_logic ()); Chris@16: if (current_ == 0) { Chris@16: BOOST_UBLAS_CHECK (it1_ != it1_end_, internal_logic ()); Chris@16: ++ it1_; Chris@16: if (it1_ == it1_end_ && end_ == 1) { Chris@16: it2_ = it2_begin_; Chris@16: current_ = 1; Chris@16: } Chris@16: } else /* if (current_ == 1) */ { Chris@16: BOOST_UBLAS_CHECK (it2_ != it2_end_, internal_logic ()); Chris@16: ++ it2_; Chris@16: if (it2_ == it2_end_ && end_ == 0) { Chris@16: it1_ = it1_begin_; Chris@16: current_ = 0; Chris@16: } Chris@16: } Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator1 &operator -- () { Chris@16: BOOST_UBLAS_CHECK (current_ == 0 || current_ == 1, internal_logic ()); Chris@16: if (current_ == 0) { Chris@16: if (it1_ == it1_begin_ && begin_ == 1) { Chris@16: it2_ = it2_end_; Chris@16: BOOST_UBLAS_CHECK (it2_ != it2_begin_, internal_logic ()); Chris@16: -- it2_; Chris@16: current_ = 1; Chris@16: } else { Chris@16: -- it1_; Chris@16: } Chris@16: } else /* if (current_ == 1) */ { Chris@16: if (it2_ == it2_begin_ && begin_ == 0) { Chris@16: it1_ = it1_end_; Chris@16: BOOST_UBLAS_CHECK (it1_ != it1_begin_, internal_logic ()); Chris@16: -- it1_; Chris@16: current_ = 0; Chris@16: } else { Chris@16: -- it2_; Chris@16: } Chris@16: } Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator1 &operator += (difference_type n) { Chris@16: BOOST_UBLAS_CHECK (current_ == 0 || current_ == 1, internal_logic ()); Chris@16: if (current_ == 0) { Chris@16: size_type d = (std::min) (n, it1_end_ - it1_); Chris@16: it1_ += d; Chris@16: n -= d; Chris@16: if (n > 0 || (end_ == 1 && it1_ == it1_end_)) { Chris@16: BOOST_UBLAS_CHECK (end_ == 1, external_logic ()); Chris@16: d = (std::min) (n, it2_end_ - it2_begin_); Chris@16: it2_ = it2_begin_ + d; Chris@16: n -= d; Chris@16: current_ = 1; Chris@16: } Chris@16: } else /* if (current_ == 1) */ { Chris@16: size_type d = (std::min) (n, it2_end_ - it2_); Chris@16: it2_ += d; Chris@16: n -= d; Chris@16: if (n > 0 || (end_ == 0 && it2_ == it2_end_)) { Chris@16: BOOST_UBLAS_CHECK (end_ == 0, external_logic ()); Chris@16: d = (std::min) (n, it1_end_ - it1_begin_); Chris@16: it1_ = it1_begin_ + d; Chris@16: n -= d; Chris@16: current_ = 0; Chris@16: } Chris@16: } Chris@16: BOOST_UBLAS_CHECK (n == 0, external_logic ()); Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator1 &operator -= (difference_type n) { Chris@16: BOOST_UBLAS_CHECK (current_ == 0 || current_ == 1, internal_logic ()); Chris@16: if (current_ == 0) { Chris@16: size_type d = (std::min) (n, it1_ - it1_begin_); Chris@16: it1_ -= d; Chris@16: n -= d; Chris@16: if (n > 0) { Chris@16: BOOST_UBLAS_CHECK (end_ == 1, external_logic ()); Chris@16: d = (std::min) (n, it2_end_ - it2_begin_); Chris@16: it2_ = it2_end_ - d; Chris@16: n -= d; Chris@16: current_ = 1; Chris@16: } Chris@16: } else /* if (current_ == 1) */ { Chris@16: size_type d = (std::min) (n, it2_ - it2_begin_); Chris@16: it2_ -= d; Chris@16: n -= d; Chris@16: if (n > 0) { Chris@16: BOOST_UBLAS_CHECK (end_ == 0, external_logic ()); Chris@16: d = (std::min) (n, it1_end_ - it1_begin_); Chris@16: it1_ = it1_end_ - d; Chris@16: n -= d; Chris@16: current_ = 0; Chris@16: } Chris@16: } Chris@16: BOOST_UBLAS_CHECK (n == 0, external_logic ()); 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) () == &it (), external_logic ()); Chris@16: BOOST_UBLAS_CHECK (current_ == 0 || current_ == 1, internal_logic ()); Chris@16: BOOST_UBLAS_CHECK (it.current_ == 0 || it.current_ == 1, internal_logic ()); Chris@16: BOOST_UBLAS_CHECK (/* begin_ == it.begin_ && */ end_ == it.end_, internal_logic ()); Chris@16: if (current_ == 0 && it.current_ == 0) { Chris@16: return it1_ - it.it1_; Chris@16: } else if (current_ == 0 && it.current_ == 1) { Chris@16: if (end_ == 1 && it.end_ == 1) { Chris@16: return (it1_ - it.it1_end_) + (it.it2_begin_ - it.it2_); Chris@16: } else /* if (end_ == 0 && it.end_ == 0) */ { Chris@16: return (it1_ - it.it1_begin_) + (it.it2_end_ - it.it2_); Chris@16: } Chris@16: Chris@16: } else if (current_ == 1 && it.current_ == 0) { Chris@16: if (end_ == 1 && it.end_ == 1) { Chris@16: return (it2_ - it.it2_begin_) + (it.it1_end_ - it.it1_); Chris@16: } else /* if (end_ == 0 && it.end_ == 0) */ { Chris@16: return (it2_ - it.it2_end_) + (it.it1_begin_ - it.it1_); Chris@16: } Chris@16: } Chris@16: /* current_ == 1 && it.current_ == 1 */ { Chris@16: return it2_ - it.it2_; Chris@16: } Chris@16: } Chris@16: Chris@16: // Dereference Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator * () const { Chris@16: BOOST_UBLAS_CHECK (current_ == 0 || current_ == 1, internal_logic ()); Chris@16: if (current_ == 0) { Chris@16: BOOST_UBLAS_CHECK (it1_ != it1_end_, internal_logic ()); Chris@16: return *it1_; Chris@16: } else /* if (current_ == 1) */ { Chris@16: BOOST_UBLAS_CHECK (it2_ != it2_end_, internal_logic ()); Chris@16: return *it2_; Chris@16: } 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 (*this) ().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: return (*this) ().find2 (1, index1 (), (*this) ().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: BOOST_UBLAS_CHECK (current_ == 0 || current_ == 1, internal_logic ()); Chris@16: if (current_ == 0) { Chris@16: BOOST_UBLAS_CHECK (it1_ != it1_end_, internal_logic ()); Chris@16: return it1_.index1 (); Chris@16: } else /* if (current_ == 1) */ { Chris@16: BOOST_UBLAS_CHECK (it2_ != it2_end_, internal_logic ()); Chris@16: return it2_.index2 (); Chris@16: } Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index2 () const { Chris@16: BOOST_UBLAS_CHECK (current_ == 0 || current_ == 1, internal_logic ()); Chris@16: if (current_ == 0) { Chris@16: BOOST_UBLAS_CHECK (it1_ != it1_end_, internal_logic ()); Chris@16: return it1_.index2 (); Chris@16: } else /* if (current_ == 1) */ { Chris@16: BOOST_UBLAS_CHECK (it2_ != it2_end_, internal_logic ()); Chris@16: return it2_.index1 (); Chris@16: } 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: begin_ = it.begin_; Chris@16: end_ = it.end_; Chris@16: current_ = it.current_; Chris@16: it1_begin_ = it.it1_begin_; Chris@16: it1_end_ = it.it1_end_; Chris@16: it1_ = it.it1_; Chris@16: it2_begin_ = it.it2_begin_; Chris@16: it2_end_ = it.it2_end_; 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) () == &it (), external_logic ()); Chris@16: BOOST_UBLAS_CHECK (current_ == 0 || current_ == 1, internal_logic ()); Chris@16: BOOST_UBLAS_CHECK (it.current_ == 0 || it.current_ == 1, internal_logic ()); Chris@16: BOOST_UBLAS_CHECK (/* begin_ == it.begin_ && */ end_ == it.end_, internal_logic ()); Chris@16: return (current_ == 0 && it.current_ == 0 && it1_ == it.it1_) || Chris@16: (current_ == 1 && it.current_ == 1 && it2_ == it.it2_); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: bool operator < (const const_iterator1 &it) const { Chris@16: BOOST_UBLAS_CHECK (&(*this) () == &it (), external_logic ()); Chris@16: return it - *this > 0; Chris@16: } Chris@16: Chris@16: private: Chris@16: int begin_; Chris@16: int end_; Chris@16: int current_; Chris@16: const_subiterator1_type it1_begin_; Chris@16: const_subiterator1_type it1_end_; Chris@16: const_subiterator1_type it1_; Chris@16: const_subiterator2_type it2_begin_; Chris@16: const_subiterator2_type it2_end_; 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 random_access_iterator_base::iterator_category, Chris@16: iterator1, value_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: 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_ () {} Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator1 (self_type &m, const subiterator1_type &it1): Chris@16: container_reference (m), it1_ (it1) {} 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) () == &it (), 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: return *it1_; 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 (*this) ().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: return (*this) ().find2 (1, index1 (), (*this) ().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 it1_.index1 (); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index2 () const { Chris@16: return it1_.index2 (); 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: 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) () == &it (), 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) () == &it (), external_logic ()); Chris@16: return it1_ < it.it1_; Chris@16: } Chris@16: Chris@16: private: Chris@16: subiterator1_type it1_; 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 random_access_iterator_base::iterator_category, Chris@16: const_iterator2, value_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: 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 (), Chris@16: begin_ (-1), end_ (-1), current_ (-1), Chris@16: it1_begin_ (), it1_end_ (), it1_ (), Chris@16: it2_begin_ (), it2_end_ (), it2_ () {} Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 (const self_type &m, int begin, int end, Chris@16: const const_subiterator1_type &it1_begin, const const_subiterator1_type &it1_end, Chris@16: const const_subiterator2_type &it2_begin, const const_subiterator2_type &it2_end): Chris@16: container_const_reference (m), Chris@16: begin_ (begin), end_ (end), current_ (begin), Chris@16: it1_begin_ (it1_begin), it1_end_ (it1_end), it1_ (it1_begin_), Chris@16: it2_begin_ (it2_begin), it2_end_ (it2_end), it2_ (it2_begin_) { Chris@16: if (current_ == 0 && it1_ == it1_end_) Chris@16: current_ = 1; Chris@16: if (current_ == 1 && it2_ == it2_end_) Chris@16: current_ = 0; Chris@16: if ((current_ == 0 && it1_ == it1_end_) || Chris@16: (current_ == 1 && it2_ == it2_end_)) Chris@16: current_ = end_; Chris@16: BOOST_UBLAS_CHECK (current_ == end_ || Chris@16: (current_ == 0 && it1_ != it1_end_) || Chris@16: (current_ == 1 && it2_ != it2_end_), internal_logic ()); Chris@16: } Chris@16: // FIXME cannot compiler Chris@16: // iterator2 does not have these members! Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 (const iterator2 &it): Chris@16: container_const_reference (it ()), Chris@16: begin_ (it.begin_), end_ (it.end_), current_ (it.current_), Chris@16: it1_begin_ (it.it1_begin_), it1_end_ (it.it1_end_), it1_ (it.it1_), Chris@16: it2_begin_ (it.it2_begin_), it2_end_ (it.it2_end_), it2_ (it.it2_) { Chris@16: BOOST_UBLAS_CHECK (current_ == end_ || Chris@16: (current_ == 0 && it1_ != it1_end_) || Chris@16: (current_ == 1 && it2_ != it2_end_), internal_logic ()); Chris@16: } Chris@16: Chris@16: // Arithmetic Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 &operator ++ () { Chris@16: BOOST_UBLAS_CHECK (current_ == 0 || current_ == 1, internal_logic ()); Chris@16: if (current_ == 0) { Chris@16: BOOST_UBLAS_CHECK (it1_ != it1_end_, internal_logic ()); Chris@16: ++ it1_; Chris@16: if (it1_ == it1_end_ && end_ == 1) { Chris@16: it2_ = it2_begin_; Chris@16: current_ = 1; Chris@16: } Chris@16: } else /* if (current_ == 1) */ { Chris@16: BOOST_UBLAS_CHECK (it2_ != it2_end_, internal_logic ()); Chris@16: ++ it2_; Chris@16: if (it2_ == it2_end_ && end_ == 0) { Chris@16: it1_ = it1_begin_; Chris@16: current_ = 0; Chris@16: } Chris@16: } Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 &operator -- () { Chris@16: BOOST_UBLAS_CHECK (current_ == 0 || current_ == 1, internal_logic ()); Chris@16: if (current_ == 0) { Chris@16: if (it1_ == it1_begin_ && begin_ == 1) { Chris@16: it2_ = it2_end_; Chris@16: BOOST_UBLAS_CHECK (it2_ != it2_begin_, internal_logic ()); Chris@16: -- it2_; Chris@16: current_ = 1; Chris@16: } else { Chris@16: -- it1_; Chris@16: } Chris@16: } else /* if (current_ == 1) */ { Chris@16: if (it2_ == it2_begin_ && begin_ == 0) { Chris@16: it1_ = it1_end_; Chris@16: BOOST_UBLAS_CHECK (it1_ != it1_begin_, internal_logic ()); Chris@16: -- it1_; Chris@16: current_ = 0; Chris@16: } else { Chris@16: -- it2_; Chris@16: } Chris@16: } Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 &operator += (difference_type n) { Chris@16: BOOST_UBLAS_CHECK (current_ == 0 || current_ == 1, internal_logic ()); Chris@16: if (current_ == 0) { Chris@16: size_type d = (std::min) (n, it1_end_ - it1_); Chris@16: it1_ += d; Chris@16: n -= d; Chris@16: if (n > 0 || (end_ == 1 && it1_ == it1_end_)) { Chris@16: BOOST_UBLAS_CHECK (end_ == 1, external_logic ()); Chris@16: d = (std::min) (n, it2_end_ - it2_begin_); Chris@16: it2_ = it2_begin_ + d; Chris@16: n -= d; Chris@16: current_ = 1; Chris@16: } Chris@16: } else /* if (current_ == 1) */ { Chris@16: size_type d = (std::min) (n, it2_end_ - it2_); Chris@16: it2_ += d; Chris@16: n -= d; Chris@16: if (n > 0 || (end_ == 0 && it2_ == it2_end_)) { Chris@16: BOOST_UBLAS_CHECK (end_ == 0, external_logic ()); Chris@16: d = (std::min) (n, it1_end_ - it1_begin_); Chris@16: it1_ = it1_begin_ + d; Chris@16: n -= d; Chris@16: current_ = 0; Chris@16: } Chris@16: } Chris@16: BOOST_UBLAS_CHECK (n == 0, external_logic ()); Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 &operator -= (difference_type n) { Chris@16: BOOST_UBLAS_CHECK (current_ == 0 || current_ == 1, internal_logic ()); Chris@16: if (current_ == 0) { Chris@16: size_type d = (std::min) (n, it1_ - it1_begin_); Chris@16: it1_ -= d; Chris@16: n -= d; Chris@16: if (n > 0) { Chris@16: BOOST_UBLAS_CHECK (end_ == 1, external_logic ()); Chris@16: d = (std::min) (n, it2_end_ - it2_begin_); Chris@16: it2_ = it2_end_ - d; Chris@16: n -= d; Chris@16: current_ = 1; Chris@16: } Chris@16: } else /* if (current_ == 1) */ { Chris@16: size_type d = (std::min) (n, it2_ - it2_begin_); Chris@16: it2_ -= d; Chris@16: n -= d; Chris@16: if (n > 0) { Chris@16: BOOST_UBLAS_CHECK (end_ == 0, external_logic ()); Chris@16: d = (std::min) (n, it1_end_ - it1_begin_); Chris@16: it1_ = it1_end_ - d; Chris@16: n -= d; Chris@16: current_ = 0; Chris@16: } Chris@16: } Chris@16: BOOST_UBLAS_CHECK (n == 0, external_logic ()); 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) () == &it (), external_logic ()); Chris@16: BOOST_UBLAS_CHECK (current_ == 0 || current_ == 1, internal_logic ()); Chris@16: BOOST_UBLAS_CHECK (it.current_ == 0 || it.current_ == 1, internal_logic ()); Chris@16: BOOST_UBLAS_CHECK (/* begin_ == it.begin_ && */ end_ == it.end_, internal_logic ()); Chris@16: if (current_ == 0 && it.current_ == 0) { Chris@16: return it1_ - it.it1_; Chris@16: } else if (current_ == 0 && it.current_ == 1) { Chris@16: if (end_ == 1 && it.end_ == 1) { Chris@16: return (it1_ - it.it1_end_) + (it.it2_begin_ - it.it2_); Chris@16: } else /* if (end_ == 0 && it.end_ == 0) */ { Chris@16: return (it1_ - it.it1_begin_) + (it.it2_end_ - it.it2_); Chris@16: } Chris@16: Chris@16: } else if (current_ == 1 && it.current_ == 0) { Chris@16: if (end_ == 1 && it.end_ == 1) { Chris@16: return (it2_ - it.it2_begin_) + (it.it1_end_ - it.it1_); Chris@16: } else /* if (end_ == 0 && it.end_ == 0) */ { Chris@16: return (it2_ - it.it2_end_) + (it.it1_begin_ - it.it1_); Chris@16: } Chris@16: } Chris@16: /* current_ == 1 && it.current_ == 1 */ { Chris@16: return it2_ - it.it2_; Chris@16: } Chris@16: } Chris@16: Chris@16: // Dereference Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator * () const { Chris@16: BOOST_UBLAS_CHECK (current_ == 0 || current_ == 1, internal_logic ()); Chris@16: if (current_ == 0) { Chris@16: BOOST_UBLAS_CHECK (it1_ != it1_end_, internal_logic ()); Chris@16: return *it1_; Chris@16: } else /* if (current_ == 1) */ { Chris@16: BOOST_UBLAS_CHECK (it2_ != it2_end_, internal_logic ()); Chris@16: return *it2_; Chris@16: } 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 (*this) ().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: return (*this) ().find1 (1, (*this) ().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: BOOST_UBLAS_CHECK (current_ == 0 || current_ == 1, internal_logic ()); Chris@16: if (current_ == 0) { Chris@16: BOOST_UBLAS_CHECK (it1_ != it1_end_, internal_logic ()); Chris@16: return it1_.index2 (); Chris@16: } else /* if (current_ == 1) */ { Chris@16: BOOST_UBLAS_CHECK (it2_ != it2_end_, internal_logic ()); Chris@16: return it2_.index1 (); Chris@16: } Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index2 () const { Chris@16: BOOST_UBLAS_CHECK (current_ == 0 || current_ == 1, internal_logic ()); Chris@16: if (current_ == 0) { Chris@16: BOOST_UBLAS_CHECK (it1_ != it1_end_, internal_logic ()); Chris@16: return it1_.index1 (); Chris@16: } else /* if (current_ == 1) */ { Chris@16: BOOST_UBLAS_CHECK (it2_ != it2_end_, internal_logic ()); Chris@16: return it2_.index2 (); Chris@16: } 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: begin_ = it.begin_; Chris@16: end_ = it.end_; Chris@16: current_ = it.current_; Chris@16: it1_begin_ = it.it1_begin_; Chris@16: it1_end_ = it.it1_end_; Chris@16: it1_ = it.it1_; Chris@16: it2_begin_ = it.it2_begin_; Chris@16: it2_end_ = it.it2_end_; 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) () == &it (), external_logic ()); Chris@16: BOOST_UBLAS_CHECK (current_ == 0 || current_ == 1, internal_logic ()); Chris@16: BOOST_UBLAS_CHECK (it.current_ == 0 || it.current_ == 1, internal_logic ()); Chris@16: BOOST_UBLAS_CHECK (/* begin_ == it.begin_ && */ end_ == it.end_, internal_logic ()); Chris@16: return (current_ == 0 && it.current_ == 0 && it1_ == it.it1_) || Chris@16: (current_ == 1 && it.current_ == 1 && 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) () == &it (), external_logic ()); Chris@16: return it - *this > 0; Chris@16: } Chris@16: Chris@16: private: Chris@16: int begin_; Chris@16: int end_; Chris@16: int current_; Chris@16: const_subiterator1_type it1_begin_; Chris@16: const_subiterator1_type it1_end_; Chris@16: const_subiterator1_type it1_; Chris@16: const_subiterator2_type it2_begin_; Chris@16: const_subiterator2_type it2_end_; 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 random_access_iterator_base::iterator_category, Chris@16: iterator2, value_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: 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 (), it2_ () {} Chris@16: BOOST_UBLAS_INLINE Chris@16: iterator2 (self_type &m, const subiterator2_type &it2): Chris@16: container_reference (m), 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) () == &it (), 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: return *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 (*this) ().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: return (*this) ().find1 (1, (*this) ().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 it2_.index1 (); Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type index2 () const { Chris@16: return it2_.index2 (); 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: 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) () == &it (), 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) () == &it (), external_logic ()); Chris@16: return it2_ < it.it2_; Chris@16: } Chris@16: Chris@16: private: 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: }; Chris@16: Chris@16: // Specialization for temporary_traits Chris@16: template Chris@16: struct vector_temporary_traits< symmetric_adaptor > Chris@16: : vector_temporary_traits< M > {} ; Chris@16: template Chris@16: struct vector_temporary_traits< const symmetric_adaptor > Chris@16: : vector_temporary_traits< M > {} ; Chris@16: Chris@16: template Chris@16: struct matrix_temporary_traits< symmetric_adaptor > Chris@16: : matrix_temporary_traits< M > {} ; Chris@16: template Chris@16: struct matrix_temporary_traits< const symmetric_adaptor > Chris@16: : matrix_temporary_traits< M > {} ; Chris@16: Chris@16: }}} Chris@16: Chris@16: #endif