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_TRIANGULAR_ Chris@16: #define _BOOST_UBLAS_TRIANGULAR_ Chris@16: 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: namespace detail { Chris@16: using namespace boost::numeric::ublas; Chris@16: Chris@16: // Matrix resizing algorithm Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void matrix_resize_preserve (M& m, M& temporary) { Chris@16: typedef L layout_type; Chris@16: typedef T triangular_type; Chris@16: typedef typename M::size_type size_type; Chris@16: const size_type msize1 (m.size1 ()); // original size Chris@16: const size_type msize2 (m.size2 ()); Chris@16: const size_type size1 (temporary.size1 ()); // new size is specified by temporary Chris@16: const size_type size2 (temporary.size2 ()); Chris@16: // Common elements to preserve Chris@16: const size_type size1_min = (std::min) (size1, msize1); Chris@16: const size_type size2_min = (std::min) (size2, msize2); Chris@16: // Order for major and minor sizes Chris@16: const size_type major_size = layout_type::size_M (size1_min, size2_min); Chris@16: const size_type minor_size = layout_type::size_m (size1_min, size2_min); Chris@16: // Indexing copy over major Chris@16: for (size_type major = 0; major != major_size; ++major) { Chris@16: for (size_type minor = 0; minor != minor_size; ++minor) { Chris@16: // find indexes - use invertability of element_ functions Chris@16: const size_type i1 = layout_type::index_M(major, minor); Chris@16: const size_type i2 = layout_type::index_m(major, minor); Chris@16: if ( triangular_type::other(i1,i2) ) { Chris@16: temporary.data () [triangular_type::element (layout_type (), i1, size1, i2, size2)] = Chris@16: m.data() [triangular_type::element (layout_type (), i1, msize1, i2, msize2)]; Chris@16: } Chris@16: } Chris@16: } Chris@16: m.assign_temporary (temporary); Chris@16: } Chris@16: } Chris@16: Chris@16: /** \brief A triangular matrix of values of type \c T. Chris@16: * Chris@16: * For a \f$(n \times n )\f$-dimensional lower triangular matrix and if \f$0 \leq i < n\f$, \f$0 \leq j < n\f$ and \f$i>j\f$ holds, Chris@16: * \f$m_{i,j}=0\f$. Furthermore if \f$m_{i,i}=1\f$, the matrix is called unit lower triangular. Chris@16: * Chris@16: * For a \f$(n \times n )\f$-dimensional upper triangular matrix and if \f$0 \leq i < n\f$, \f$0 \leq j < n\f$ and \f$i Chris@16: class triangular_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 triangular_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: triangular_matrix (): Chris@16: matrix_container (), Chris@16: size1_ (0), size2_ (0), data_ (0) {} Chris@16: BOOST_UBLAS_INLINE Chris@16: triangular_matrix (size_type size1, size_type size2): Chris@16: matrix_container (), Chris@16: size1_ (size1), size2_ (size2), data_ (triangular_type::packed_size (layout_type (), size1, size2)) { Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: triangular_matrix (size_type size1, size_type size2, const array_type &data): Chris@16: matrix_container (), Chris@16: size1_ (size1), size2_ (size2), data_ (data) {} Chris@16: BOOST_UBLAS_INLINE Chris@16: triangular_matrix (const triangular_matrix &m): Chris@16: matrix_container (), Chris@16: size1_ (m.size1_), size2_ (m.size2_), data_ (m.data_) {} Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: triangular_matrix (const matrix_expression &ae): Chris@16: matrix_container (), Chris@16: size1_ (ae ().size1 ()), size2_ (ae ().size2 ()), Chris@16: data_ (triangular_type::packed_size (layout_type (), size1_, size2_)) { 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 size1_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: size_type size2 () const { Chris@16: return size2_; 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 size1, size_type size2, bool preserve = true) { Chris@16: if (preserve) { Chris@16: self_type temporary (size1, size2); Chris@16: detail::matrix_resize_preserve (*this, temporary); Chris@16: } Chris@16: else { Chris@16: data ().resize (triangular_type::packed_size (layout_type (), size1, size2)); Chris@16: size1_ = size1; Chris@16: size2_ = size2; Chris@16: } Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: void resize_packed_preserve (size_type size1, size_type size2) { Chris@16: size1_ = size1; Chris@16: size2_ = size2; Chris@16: data ().resize (triangular_type::packed_size (layout_type (), size1_, size2_), 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 < size1_, bad_index ()); Chris@16: BOOST_UBLAS_CHECK (j < size2_, bad_index ()); Chris@16: if (triangular_type::other (i, j)) Chris@16: return data () [triangular_type::element (layout_type (), i, size1_, j, size2_)]; Chris@16: else if (triangular_type::one (i, j)) Chris@16: return one_; Chris@16: else Chris@16: return zero_; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: reference at_element (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: return data () [triangular_type::element (layout_type (), i, size1_, j, size2_)]; 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: bad_index ().raise (); Chris@16: // NEVER reached Chris@16: } Chris@16: return data () [triangular_type::element (layout_type (), i, size1_, j, size2_)]; 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: triangular_matrix &operator = (const triangular_matrix &m) { Chris@16: size1_ = m.size1_; Chris@16: size2_ = m.size2_; Chris@16: data () = m.data (); Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: triangular_matrix &assign_temporary (triangular_matrix &m) { Chris@16: swap (m); Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: triangular_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: triangular_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: triangular_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: triangular_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: triangular_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: triangular_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: triangular_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: triangular_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 (triangular_matrix &m) { Chris@16: if (this != &m) { Chris@16: // BOOST_UBLAS_CHECK (size2_ == m.size2_, bad_size ()); Chris@16: std::swap (size1_, m.size1_); Chris@16: std::swap (size2_, m.size2_); Chris@16: data ().swap (m.data ()); Chris@16: } Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: friend void swap (triangular_matrix &m1, triangular_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: if (rank == 1) Chris@16: i = triangular_type::restrict1 (i, j, size1_, size2_); Chris@16: if (rank == 0) Chris@16: i = triangular_type::global_restrict1 (i, size1_, j, size2_); 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: if (rank == 1) Chris@16: j = triangular_type::restrict2 (i, j, size1_, size2_); Chris@16: if (rank == 0) Chris@16: j = triangular_type::global_restrict2 (i, size1_, j, size2_); 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 triangular_matrix::value_type value_type; Chris@16: typedef typename triangular_matrix::difference_type difference_type; Chris@16: typedef typename triangular_matrix::const_reference reference; Chris@16: typedef const typename triangular_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, 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 { Chris@16: public: Chris@16: typedef typename triangular_matrix::value_type value_type; Chris@16: typedef typename triangular_matrix::difference_type difference_type; Chris@16: typedef typename triangular_matrix::reference reference; Chris@16: typedef typename triangular_matrix::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_ (), 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, 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 { Chris@16: public: Chris@16: typedef typename triangular_matrix::value_type value_type; Chris@16: typedef typename triangular_matrix::difference_type difference_type; Chris@16: typedef typename triangular_matrix::const_reference reference; Chris@16: typedef const typename triangular_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: 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, 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 { Chris@16: public: Chris@16: typedef typename triangular_matrix::value_type value_type; Chris@16: typedef typename triangular_matrix::difference_type difference_type; Chris@16: typedef typename triangular_matrix::reference reference; Chris@16: typedef typename triangular_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, 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: size_type size1_; Chris@16: size_type size2_; Chris@16: array_type data_; Chris@16: static const value_type zero_; Chris@16: static const value_type one_; Chris@16: }; Chris@16: Chris@16: template Chris@16: const typename triangular_matrix::value_type triangular_matrix::zero_ = value_type/*zero*/(); Chris@16: template Chris@16: const typename triangular_matrix::value_type triangular_matrix::one_ (1); Chris@16: Chris@16: Chris@16: // Triangular matrix adaptor class Chris@16: template Chris@16: class triangular_adaptor: Chris@16: public matrix_expression > { Chris@16: Chris@16: typedef triangular_adaptor self_type; Chris@16: 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: triangular_adaptor (matrix_type &data): Chris@16: matrix_expression (), Chris@16: data_ (data) {} Chris@16: BOOST_UBLAS_INLINE Chris@16: triangular_adaptor (const triangular_adaptor &m): Chris@16: matrix_expression (), Chris@16: data_ (m.data_) {} 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 if (triangular_type::one (i, j)) Chris@16: return one_; Chris@16: else Chris@16: return zero_; 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: bad_index ().raise (); Chris@16: // NEVER reached Chris@16: } Chris@16: return data () (i, j); 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: bad_index ().raise (); Chris@16: // NEVER reached Chris@16: } Chris@16: return data () (i, j); Chris@16: } Chris@16: #endif Chris@16: Chris@16: // Assignment Chris@16: BOOST_UBLAS_INLINE Chris@16: triangular_adaptor &operator = (const triangular_adaptor &m) { Chris@16: matrix_assign (*this, m); Chris@16: return *this; Chris@16: } Chris@16: BOOST_UBLAS_INLINE Chris@16: triangular_adaptor &assign_temporary (triangular_adaptor &m) { Chris@16: *this = m; Chris@16: return *this; Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: triangular_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: triangular_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: triangular_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: triangular_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: triangular_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: triangular_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: triangular_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: triangular_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 triangular_adaptor &ta) const { Chris@16: return (*this).data ().same_closure (ta.data ()); Chris@16: } Chris@16: Chris@16: // Swapping Chris@16: BOOST_UBLAS_INLINE Chris@16: void swap (triangular_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 (triangular_adaptor &m1, triangular_adaptor &m2) { Chris@16: m1.swap (m2); 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 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 (rank == 1) Chris@16: i = triangular_type::restrict1 (i, j, size1(), size2()); Chris@16: if (rank == 0) Chris@16: i = triangular_type::global_restrict1 (i, size1(), j, size2()); Chris@16: return const_iterator1 (*this, data ().find1 (rank, 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, 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 (rank == 1) Chris@16: j = triangular_type::restrict2 (i, j, size1(), size2()); Chris@16: if (rank == 0) Chris@16: j = triangular_type::global_restrict2 (i, size1(), j, size2()); Chris@16: return const_iterator2 (*this, data ().find2 (rank, 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, 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 (), it1_ () {} Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator1 (const self_type &m, const const_subiterator1_type &it1): Chris@16: container_const_reference (m), it1_ (it1) {} Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator1 (const iterator1 &it): Chris@16: container_const_reference (it ()), it1_ (it.it1_) {} 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: return it1_ - it.it1_; Chris@16: } Chris@16: Chris@16: // Dereference Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator * () const { Chris@16: size_type i = index1 (); Chris@16: size_type j = index2 (); Chris@16: BOOST_UBLAS_CHECK (i < (*this) ().size1 (), bad_index ()); Chris@16: BOOST_UBLAS_CHECK (j < (*this) ().size2 (), bad_index ()); Chris@16: if (triangular_type::other (i, j)) Chris@16: return *it1_; Chris@16: else Chris@16: return (*this) () (i, j); 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: 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_.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: const_iterator1 &operator = (const const_iterator1 &it) { Chris@16: container_const_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 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 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: const_subiterator1_type it1_; 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: size_type i = index1 (); Chris@16: size_type j = index2 (); Chris@16: BOOST_UBLAS_CHECK (i < (*this) ().size1 (), bad_index ()); Chris@16: BOOST_UBLAS_CHECK (j < (*this) ().size2 (), bad_index ()); Chris@16: if (triangular_type::other (i, j)) Chris@16: return *it1_; Chris@16: else Chris@16: return (*this) () (i, j); 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 (), it2_ () {} Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 (const self_type &m, const const_subiterator2_type &it2): Chris@16: container_const_reference (m), it2_ (it2) {} Chris@16: BOOST_UBLAS_INLINE Chris@16: const_iterator2 (const iterator2 &it): Chris@16: container_const_reference (it ()), 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: return it2_ - it.it2_; Chris@16: } Chris@16: Chris@16: // Dereference Chris@16: BOOST_UBLAS_INLINE Chris@16: const_reference operator * () const { Chris@16: size_type i = index1 (); Chris@16: size_type j = index2 (); Chris@16: BOOST_UBLAS_CHECK (i < (*this) ().size1 (), bad_index ()); Chris@16: BOOST_UBLAS_CHECK (j < (*this) ().size2 (), bad_index ()); Chris@16: if (triangular_type::other (i, j)) Chris@16: return *it2_; Chris@16: else Chris@16: return (*this) () (i, j); 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: 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: const_iterator2 &operator = (const const_iterator2 &it) { Chris@16: container_const_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 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 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: 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: size_type i = index1 (); Chris@16: size_type j = index2 (); Chris@16: BOOST_UBLAS_CHECK (i < (*this) ().size1 (), bad_index ()); Chris@16: BOOST_UBLAS_CHECK (j < (*this) ().size2 (), bad_index ()); Chris@16: if (triangular_type::other (i, j)) Chris@16: return *it2_; Chris@16: else Chris@16: return (*this) () (i, j); 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: static const value_type zero_; Chris@16: static const value_type one_; Chris@16: }; Chris@16: Chris@16: template Chris@16: const typename triangular_adaptor::value_type triangular_adaptor::zero_ = value_type/*zero*/(); Chris@16: template Chris@16: const typename triangular_adaptor::value_type triangular_adaptor::one_ (1); Chris@16: Chris@16: template Chris@16: struct vector_temporary_traits< triangular_adaptor > Chris@16: : vector_temporary_traits< typename boost::remove_const::type > {} ; Chris@16: template Chris@16: struct vector_temporary_traits< const triangular_adaptor > Chris@16: : vector_temporary_traits< typename boost::remove_const::type > {} ; Chris@16: Chris@16: template Chris@16: struct matrix_temporary_traits< triangular_adaptor > Chris@16: : matrix_temporary_traits< typename boost::remove_const::type > {}; Chris@16: template Chris@16: struct matrix_temporary_traits< const triangular_adaptor > Chris@16: : matrix_temporary_traits< typename boost::remove_const::type > {}; Chris@16: Chris@16: Chris@16: template Chris@16: struct matrix_vector_solve_traits { Chris@16: typedef typename promote_traits::promote_type promote_type; Chris@16: typedef vector result_type; Chris@16: }; Chris@16: Chris@16: // Operations: Chris@16: // n * (n - 1) / 2 + n = n * (n + 1) / 2 multiplications, Chris@16: // n * (n - 1) / 2 additions Chris@16: Chris@16: // Dense (proxy) case Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void inplace_solve (const matrix_expression &e1, vector_expression &e2, Chris@16: lower_tag, column_major_tag, dense_proxy_tag) { Chris@16: typedef typename E2::size_type size_type; Chris@16: typedef typename E2::value_type value_type; Chris@16: Chris@16: BOOST_UBLAS_CHECK (e1 ().size1 () == e1 ().size2 (), bad_size ()); Chris@16: BOOST_UBLAS_CHECK (e1 ().size2 () == e2 ().size (), bad_size ()); Chris@16: size_type size = e2 ().size (); Chris@16: for (size_type n = 0; n < size; ++ n) { Chris@16: #ifndef BOOST_UBLAS_SINGULAR_CHECK Chris@16: BOOST_UBLAS_CHECK (e1 () (n, n) != value_type/*zero*/(), singular ()); Chris@16: #else Chris@16: if (e1 () (n, n) == value_type/*zero*/()) Chris@16: singular ().raise (); Chris@16: #endif Chris@16: value_type t = e2 () (n) /= e1 () (n, n); Chris@16: if (t != value_type/*zero*/()) { Chris@16: for (size_type m = n + 1; m < size; ++ m) Chris@16: e2 () (m) -= e1 () (m, n) * t; Chris@16: } Chris@16: } Chris@16: } Chris@16: // Packed (proxy) case Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void inplace_solve (const matrix_expression &e1, vector_expression &e2, Chris@16: lower_tag, column_major_tag, packed_proxy_tag) { Chris@16: typedef typename E2::size_type size_type; Chris@16: typedef typename E2::difference_type difference_type; Chris@16: typedef typename E2::value_type value_type; Chris@16: Chris@16: BOOST_UBLAS_CHECK (e1 ().size1 () == e1 ().size2 (), bad_size ()); Chris@16: BOOST_UBLAS_CHECK (e1 ().size2 () == e2 ().size (), bad_size ()); Chris@16: size_type size = e2 ().size (); Chris@16: for (size_type n = 0; n < size; ++ n) { Chris@16: #ifndef BOOST_UBLAS_SINGULAR_CHECK Chris@16: BOOST_UBLAS_CHECK (e1 () (n, n) != value_type/*zero*/(), singular ()); Chris@16: #else Chris@16: if (e1 () (n, n) == value_type/*zero*/()) Chris@16: singular ().raise (); Chris@16: #endif Chris@16: value_type t = e2 () (n) /= e1 () (n, n); Chris@16: if (t != value_type/*zero*/()) { Chris@16: typename E1::const_iterator1 it1e1 (e1 ().find1 (1, n + 1, n)); Chris@16: typename E1::const_iterator1 it1e1_end (e1 ().find1 (1, e1 ().size1 (), n)); Chris@16: difference_type m (it1e1_end - it1e1); Chris@16: while (-- m >= 0) Chris@16: e2 () (it1e1.index1 ()) -= *it1e1 * t, ++ it1e1; Chris@16: } Chris@16: } Chris@16: } Chris@16: // Sparse (proxy) case Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void inplace_solve (const matrix_expression &e1, vector_expression &e2, Chris@16: lower_tag, column_major_tag, unknown_storage_tag) { Chris@16: typedef typename E2::size_type size_type; Chris@16: typedef typename E2::value_type value_type; Chris@16: Chris@16: BOOST_UBLAS_CHECK (e1 ().size1 () == e1 ().size2 (), bad_size ()); Chris@16: BOOST_UBLAS_CHECK (e1 ().size2 () == e2 ().size (), bad_size ()); Chris@16: size_type size = e2 ().size (); Chris@16: for (size_type n = 0; n < size; ++ n) { Chris@16: #ifndef BOOST_UBLAS_SINGULAR_CHECK Chris@16: BOOST_UBLAS_CHECK (e1 () (n, n) != value_type/*zero*/(), singular ()); Chris@16: #else Chris@16: if (e1 () (n, n) == value_type/*zero*/()) Chris@16: singular ().raise (); Chris@16: #endif Chris@16: value_type t = e2 () (n) /= e1 () (n, n); Chris@16: if (t != value_type/*zero*/()) { Chris@16: typename E1::const_iterator1 it1e1 (e1 ().find1 (1, n + 1, n)); Chris@16: typename E1::const_iterator1 it1e1_end (e1 ().find1 (1, e1 ().size1 (), n)); Chris@16: while (it1e1 != it1e1_end) Chris@16: e2 () (it1e1.index1 ()) -= *it1e1 * t, ++ it1e1; Chris@16: } Chris@16: } Chris@16: } Chris@16: Chris@16: // Dense (proxy) case Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void inplace_solve (const matrix_expression &e1, vector_expression &e2, Chris@16: lower_tag, row_major_tag, dense_proxy_tag) { Chris@16: typedef typename E2::size_type size_type; Chris@16: typedef typename E2::value_type value_type; Chris@16: Chris@16: BOOST_UBLAS_CHECK (e1 ().size1 () == e1 ().size2 (), bad_size ()); Chris@16: BOOST_UBLAS_CHECK (e1 ().size2 () == e2 ().size (), bad_size ()); Chris@16: size_type size = e2 ().size (); Chris@16: for (size_type n = 0; n < size; ++ n) { Chris@16: #ifndef BOOST_UBLAS_SINGULAR_CHECK Chris@16: BOOST_UBLAS_CHECK (e1 () (n, n) != value_type/*zero*/(), singular ()); Chris@16: #else Chris@16: if (e1 () (n, n) == value_type/*zero*/()) Chris@16: singular ().raise (); Chris@16: #endif Chris@16: value_type t = e2 () (n) /= e1 () (n, n); Chris@16: if (t != value_type/*zero*/()) { Chris@16: for (size_type m = n + 1; m < size; ++ m) Chris@16: e2 () (m) -= e1 () (m, n) * t; Chris@16: } Chris@16: } Chris@16: } Chris@16: // Packed (proxy) case Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void inplace_solve (const matrix_expression &e1, vector_expression &e2, Chris@16: lower_tag, row_major_tag, packed_proxy_tag) { Chris@16: typedef typename E2::size_type size_type; Chris@16: typedef typename E2::value_type value_type; Chris@16: Chris@16: BOOST_UBLAS_CHECK (e1 ().size1 () == e1 ().size2 (), bad_size ()); Chris@16: BOOST_UBLAS_CHECK (e1 ().size2 () == e2 ().size (), bad_size ()); Chris@16: size_type size = e2 ().size (); Chris@16: for (size_type n = 0; n < size; ++ n) { Chris@16: #ifndef BOOST_UBLAS_SINGULAR_CHECK Chris@16: BOOST_UBLAS_CHECK (e1 () (n, n) != value_type/*zero*/(), singular ()); Chris@16: #else Chris@16: if (e1 () (n, n) == value_type/*zero*/()) Chris@16: singular ().raise (); Chris@16: #endif Chris@16: value_type t = e2 () (n); Chris@16: typename E1::const_iterator2 it2e1 (e1 ().find2 (1, n, 0)); Chris@16: typename E1::const_iterator2 it2e1_end (e1 ().find2 (1, n, n)); Chris@16: while (it2e1 != it2e1_end) { Chris@16: t -= *it2e1 * e2 () (it2e1.index2()); Chris@16: ++ it2e1; Chris@16: } Chris@16: e2() (n) = t / e1 () (n, n); Chris@16: } Chris@16: } Chris@16: // Sparse (proxy) case Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void inplace_solve (const matrix_expression &e1, vector_expression &e2, Chris@16: lower_tag, row_major_tag, unknown_storage_tag) { Chris@16: typedef typename E2::size_type size_type; Chris@16: typedef typename E2::value_type value_type; Chris@16: Chris@16: BOOST_UBLAS_CHECK (e1 ().size1 () == e1 ().size2 (), bad_size ()); Chris@16: BOOST_UBLAS_CHECK (e1 ().size2 () == e2 ().size (), bad_size ()); Chris@16: size_type size = e2 ().size (); Chris@16: for (size_type n = 0; n < size; ++ n) { Chris@16: #ifndef BOOST_UBLAS_SINGULAR_CHECK Chris@16: BOOST_UBLAS_CHECK (e1 () (n, n) != value_type/*zero*/(), singular ()); Chris@16: #else Chris@16: if (e1 () (n, n) == value_type/*zero*/()) Chris@16: singular ().raise (); Chris@16: #endif Chris@16: value_type t = e2 () (n); Chris@16: typename E1::const_iterator2 it2e1 (e1 ().find2 (1, n, 0)); Chris@16: typename E1::const_iterator2 it2e1_end (e1 ().find2 (1, n, n)); Chris@16: while (it2e1 != it2e1_end) { Chris@16: t -= *it2e1 * e2 () (it2e1.index2()); Chris@16: ++ it2e1; Chris@16: } Chris@16: e2() (n) = t / e1 () (n, n); Chris@16: } Chris@16: } Chris@16: Chris@16: // Redirectors :-) Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void inplace_solve (const matrix_expression &e1, vector_expression &e2, Chris@16: lower_tag, column_major_tag) { Chris@16: typedef typename E1::storage_category storage_category; Chris@16: inplace_solve (e1, e2, Chris@16: lower_tag (), column_major_tag (), storage_category ()); Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void inplace_solve (const matrix_expression &e1, vector_expression &e2, Chris@16: lower_tag, row_major_tag) { Chris@16: typedef typename E1::storage_category storage_category; Chris@16: inplace_solve (e1, e2, Chris@16: lower_tag (), row_major_tag (), storage_category ()); Chris@16: } Chris@16: // Dispatcher Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void inplace_solve (const matrix_expression &e1, vector_expression &e2, Chris@16: lower_tag) { Chris@16: typedef typename E1::orientation_category orientation_category; Chris@16: inplace_solve (e1, e2, Chris@16: lower_tag (), orientation_category ()); Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void inplace_solve (const matrix_expression &e1, vector_expression &e2, Chris@16: unit_lower_tag) { Chris@16: typedef typename E1::orientation_category orientation_category; Chris@16: inplace_solve (triangular_adaptor (e1 ()), e2, Chris@16: unit_lower_tag (), orientation_category ()); Chris@16: } Chris@16: Chris@16: // Dense (proxy) case Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void inplace_solve (const matrix_expression &e1, vector_expression &e2, Chris@16: upper_tag, column_major_tag, dense_proxy_tag) { Chris@16: typedef typename E2::size_type size_type; Chris@16: typedef typename E2::difference_type difference_type; Chris@16: typedef typename E2::value_type value_type; Chris@16: Chris@16: BOOST_UBLAS_CHECK (e1 ().size1 () == e1 ().size2 (), bad_size ()); Chris@16: BOOST_UBLAS_CHECK (e1 ().size2 () == e2 ().size (), bad_size ()); Chris@16: size_type size = e2 ().size (); Chris@16: for (difference_type n = size - 1; n >= 0; -- n) { Chris@16: #ifndef BOOST_UBLAS_SINGULAR_CHECK Chris@16: BOOST_UBLAS_CHECK (e1 () (n, n) != value_type/*zero*/(), singular ()); Chris@16: #else Chris@16: if (e1 () (n, n) == value_type/*zero*/()) Chris@16: singular ().raise (); Chris@16: #endif Chris@16: value_type t = e2 () (n) /= e1 () (n, n); Chris@16: if (t != value_type/*zero*/()) { Chris@16: for (difference_type m = n - 1; m >= 0; -- m) Chris@16: e2 () (m) -= e1 () (m, n) * t; Chris@16: } Chris@16: } Chris@16: } Chris@16: // Packed (proxy) case Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void inplace_solve (const matrix_expression &e1, vector_expression &e2, Chris@16: upper_tag, column_major_tag, packed_proxy_tag) { Chris@16: typedef typename E2::size_type size_type; Chris@16: typedef typename E2::difference_type difference_type; Chris@16: typedef typename E2::value_type value_type; Chris@16: Chris@16: BOOST_UBLAS_CHECK (e1 ().size1 () == e1 ().size2 (), bad_size ()); Chris@16: BOOST_UBLAS_CHECK (e1 ().size2 () == e2 ().size (), bad_size ()); Chris@16: size_type size = e2 ().size (); Chris@16: for (difference_type n = size - 1; n >= 0; -- n) { Chris@16: #ifndef BOOST_UBLAS_SINGULAR_CHECK Chris@16: BOOST_UBLAS_CHECK (e1 () (n, n) != value_type/*zero*/(), singular ()); Chris@16: #else Chris@16: if (e1 () (n, n) == value_type/*zero*/()) Chris@16: singular ().raise (); Chris@16: #endif Chris@16: value_type t = e2 () (n) /= e1 () (n, n); Chris@16: if (t != value_type/*zero*/()) { Chris@16: typename E1::const_reverse_iterator1 it1e1 (e1 ().find1 (1, n, n)); Chris@16: typename E1::const_reverse_iterator1 it1e1_rend (e1 ().find1 (1, 0, n)); Chris@16: while (it1e1 != it1e1_rend) { Chris@16: e2 () (it1e1.index1 ()) -= *it1e1 * t, ++ it1e1; Chris@16: } Chris@16: } Chris@16: } Chris@16: } Chris@16: // Sparse (proxy) case Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void inplace_solve (const matrix_expression &e1, vector_expression &e2, Chris@16: upper_tag, column_major_tag, unknown_storage_tag) { Chris@16: typedef typename E2::size_type size_type; Chris@16: typedef typename E2::difference_type difference_type; Chris@16: typedef typename E2::value_type value_type; Chris@16: Chris@16: BOOST_UBLAS_CHECK (e1 ().size1 () == e1 ().size2 (), bad_size ()); Chris@16: BOOST_UBLAS_CHECK (e1 ().size2 () == e2 ().size (), bad_size ()); Chris@16: size_type size = e2 ().size (); Chris@16: for (difference_type n = size - 1; n >= 0; -- n) { Chris@16: #ifndef BOOST_UBLAS_SINGULAR_CHECK Chris@16: BOOST_UBLAS_CHECK (e1 () (n, n) != value_type/*zero*/(), singular ()); Chris@16: #else Chris@16: if (e1 () (n, n) == value_type/*zero*/()) Chris@16: singular ().raise (); Chris@16: #endif Chris@16: value_type t = e2 () (n) /= e1 () (n, n); Chris@16: if (t != value_type/*zero*/()) { Chris@16: typename E1::const_reverse_iterator1 it1e1 (e1 ().find1 (1, n, n)); Chris@16: typename E1::const_reverse_iterator1 it1e1_rend (e1 ().find1 (1, 0, n)); Chris@16: while (it1e1 != it1e1_rend) { Chris@16: e2 () (it1e1.index1 ()) -= *it1e1 * t, ++ it1e1; Chris@16: } Chris@16: } Chris@16: } Chris@16: } Chris@16: Chris@16: // Dense (proxy) case Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void inplace_solve (const matrix_expression &e1, vector_expression &e2, Chris@16: upper_tag, row_major_tag, dense_proxy_tag) { Chris@16: typedef typename E2::size_type size_type; Chris@16: typedef typename E2::difference_type difference_type; Chris@16: typedef typename E2::value_type value_type; Chris@16: Chris@16: BOOST_UBLAS_CHECK (e1 ().size1 () == e1 ().size2 (), bad_size ()); Chris@16: BOOST_UBLAS_CHECK (e1 ().size2 () == e2 ().size (), bad_size ()); Chris@16: size_type size = e1 ().size1 (); Chris@16: for (difference_type n = size-1; n >=0; -- n) { Chris@16: #ifndef BOOST_UBLAS_SINGULAR_CHECK Chris@16: BOOST_UBLAS_CHECK (e1 () (n, n) != value_type/*zero*/(), singular ()); Chris@16: #else Chris@16: if (e1 () (n, n) == value_type/*zero*/()) Chris@16: singular ().raise (); Chris@16: #endif Chris@16: value_type t = e2 () (n); Chris@101: for (difference_type m = n + 1; m < static_cast(e1 ().size2()); ++ m) { Chris@16: t -= e1 () (n, m) * e2 () (m); Chris@16: } Chris@16: e2() (n) = t / e1 () (n, n); Chris@16: } Chris@16: } Chris@16: // Packed (proxy) case Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void inplace_solve (const matrix_expression &e1, vector_expression &e2, Chris@16: upper_tag, row_major_tag, packed_proxy_tag) { Chris@16: typedef typename E2::size_type size_type; Chris@16: typedef typename E2::difference_type difference_type; Chris@16: typedef typename E2::value_type value_type; Chris@16: Chris@16: BOOST_UBLAS_CHECK (e1 ().size1 () == e1 ().size2 (), bad_size ()); Chris@16: BOOST_UBLAS_CHECK (e1 ().size2 () == e2 ().size (), bad_size ()); Chris@16: size_type size = e1 ().size1 (); Chris@16: for (difference_type n = size-1; n >=0; -- n) { Chris@16: #ifndef BOOST_UBLAS_SINGULAR_CHECK Chris@16: BOOST_UBLAS_CHECK (e1 () (n, n) != value_type/*zero*/(), singular ()); Chris@16: #else Chris@16: if (e1 () (n, n) == value_type/*zero*/()) Chris@16: singular ().raise (); Chris@16: #endif Chris@16: value_type t = e2 () (n); Chris@16: typename E1::const_iterator2 it2e1 (e1 ().find2 (1, n, n+1)); Chris@16: typename E1::const_iterator2 it2e1_end (e1 ().find2 (1, n, e1 ().size2 ())); Chris@16: while (it2e1 != it2e1_end) { Chris@16: t -= *it2e1 * e2 () (it2e1.index2()); Chris@16: ++ it2e1; Chris@16: } Chris@16: e2() (n) = t / e1 () (n, n); Chris@16: Chris@16: } Chris@16: } Chris@16: // Sparse (proxy) case Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void inplace_solve (const matrix_expression &e1, vector_expression &e2, Chris@16: upper_tag, row_major_tag, unknown_storage_tag) { Chris@16: typedef typename E2::size_type size_type; Chris@16: typedef typename E2::difference_type difference_type; Chris@16: typedef typename E2::value_type value_type; Chris@16: Chris@16: BOOST_UBLAS_CHECK (e1 ().size1 () == e1 ().size2 (), bad_size ()); Chris@16: BOOST_UBLAS_CHECK (e1 ().size2 () == e2 ().size (), bad_size ()); Chris@16: size_type size = e1 ().size1 (); Chris@16: for (difference_type n = size-1; n >=0; -- n) { Chris@16: #ifndef BOOST_UBLAS_SINGULAR_CHECK Chris@16: BOOST_UBLAS_CHECK (e1 () (n, n) != value_type/*zero*/(), singular ()); Chris@16: #else Chris@16: if (e1 () (n, n) == value_type/*zero*/()) Chris@16: singular ().raise (); Chris@16: #endif Chris@16: value_type t = e2 () (n); Chris@16: typename E1::const_iterator2 it2e1 (e1 ().find2 (1, n, n+1)); Chris@16: typename E1::const_iterator2 it2e1_end (e1 ().find2 (1, n, e1 ().size2 ())); Chris@16: while (it2e1 != it2e1_end) { Chris@16: t -= *it2e1 * e2 () (it2e1.index2()); Chris@16: ++ it2e1; Chris@16: } Chris@16: e2() (n) = t / e1 () (n, n); Chris@16: Chris@16: } Chris@16: } Chris@16: Chris@16: // Redirectors :-) Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void inplace_solve (const matrix_expression &e1, vector_expression &e2, Chris@16: upper_tag, column_major_tag) { Chris@16: typedef typename E1::storage_category storage_category; Chris@16: inplace_solve (e1, e2, Chris@16: upper_tag (), column_major_tag (), storage_category ()); Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void inplace_solve (const matrix_expression &e1, vector_expression &e2, Chris@16: upper_tag, row_major_tag) { Chris@16: typedef typename E1::storage_category storage_category; Chris@16: inplace_solve (e1, e2, Chris@16: upper_tag (), row_major_tag (), storage_category ()); Chris@16: } Chris@16: // Dispatcher Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void inplace_solve (const matrix_expression &e1, vector_expression &e2, Chris@16: upper_tag) { Chris@16: typedef typename E1::orientation_category orientation_category; Chris@16: inplace_solve (e1, e2, Chris@16: upper_tag (), orientation_category ()); Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void inplace_solve (const matrix_expression &e1, vector_expression &e2, Chris@16: unit_upper_tag) { Chris@16: typedef typename E1::orientation_category orientation_category; Chris@16: inplace_solve (triangular_adaptor (e1 ()), e2, Chris@16: unit_upper_tag (), orientation_category ()); Chris@16: } Chris@16: Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: typename matrix_vector_solve_traits::result_type Chris@16: solve (const matrix_expression &e1, Chris@16: const vector_expression &e2, Chris@16: C) { Chris@16: typename matrix_vector_solve_traits::result_type r (e2); Chris@16: inplace_solve (e1, r, C ()); Chris@16: return r; Chris@16: } Chris@16: Chris@16: Chris@16: // Redirectors :-) Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void inplace_solve (vector_expression &e1, const matrix_expression &e2, Chris@16: lower_tag, row_major_tag) { Chris@16: typedef typename E2::storage_category storage_category; Chris@16: inplace_solve (trans(e2), e1, Chris@16: upper_tag (), column_major_tag (), storage_category ()); Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void inplace_solve (vector_expression &e1, const matrix_expression &e2, Chris@16: lower_tag, column_major_tag) { Chris@16: typedef typename E2::storage_category storage_category; Chris@16: inplace_solve (trans (e2), e1, Chris@16: upper_tag (), row_major_tag (), storage_category ()); Chris@16: } Chris@16: // Dispatcher Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void inplace_solve (vector_expression &e1, const matrix_expression &e2, Chris@16: lower_tag) { Chris@16: typedef typename E2::orientation_category orientation_category; Chris@16: inplace_solve (e1, e2, Chris@16: lower_tag (), orientation_category ()); Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void inplace_solve (vector_expression &e1, const matrix_expression &e2, Chris@16: unit_lower_tag) { Chris@16: typedef typename E2::orientation_category orientation_category; Chris@16: inplace_solve (e1, triangular_adaptor (e2 ()), Chris@16: unit_lower_tag (), orientation_category ()); Chris@16: } Chris@16: Chris@16: Chris@16: // Redirectors :-) Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void inplace_solve (vector_expression &e1, const matrix_expression &e2, Chris@16: upper_tag, row_major_tag) { Chris@16: typedef typename E2::storage_category storage_category; Chris@16: inplace_solve (trans(e2), e1, Chris@16: lower_tag (), column_major_tag (), storage_category ()); Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void inplace_solve (vector_expression &e1, const matrix_expression &e2, Chris@16: upper_tag, column_major_tag) { Chris@16: typedef typename E2::storage_category storage_category; Chris@16: inplace_solve (trans (e2), e1, Chris@16: lower_tag (), row_major_tag (), storage_category ()); Chris@16: } Chris@16: // Dispatcher Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void inplace_solve (vector_expression &e1, const matrix_expression &e2, Chris@16: upper_tag) { Chris@16: typedef typename E2::orientation_category orientation_category; Chris@16: inplace_solve (e1, e2, Chris@16: upper_tag (), orientation_category ()); Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void inplace_solve (vector_expression &e1, const matrix_expression &e2, Chris@16: unit_upper_tag) { Chris@16: typedef typename E2::orientation_category orientation_category; Chris@16: inplace_solve (e1, triangular_adaptor (e2 ()), Chris@16: unit_upper_tag (), orientation_category ()); Chris@16: } Chris@16: Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: typename matrix_vector_solve_traits::result_type Chris@16: solve (const vector_expression &e1, Chris@16: const matrix_expression &e2, Chris@16: C) { Chris@16: typename matrix_vector_solve_traits::result_type r (e1); Chris@16: inplace_solve (r, e2, C ()); Chris@16: return r; Chris@16: } Chris@16: Chris@16: template Chris@16: struct matrix_matrix_solve_traits { Chris@16: typedef typename promote_traits::promote_type promote_type; Chris@16: typedef matrix result_type; Chris@16: }; Chris@16: Chris@16: // Operations: Chris@16: // k * n * (n - 1) / 2 + k * n = k * n * (n + 1) / 2 multiplications, Chris@16: // k * n * (n - 1) / 2 additions Chris@16: Chris@16: // Dense (proxy) case Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void inplace_solve (const matrix_expression &e1, matrix_expression &e2, Chris@16: lower_tag, dense_proxy_tag) { Chris@16: typedef typename E2::size_type size_type; Chris@16: typedef typename E2::value_type value_type; Chris@16: Chris@16: BOOST_UBLAS_CHECK (e1 ().size1 () == e1 ().size2 (), bad_size ()); Chris@16: BOOST_UBLAS_CHECK (e1 ().size2 () == e2 ().size1 (), bad_size ()); Chris@16: size_type size1 = e2 ().size1 (); Chris@16: size_type size2 = e2 ().size2 (); Chris@16: for (size_type n = 0; n < size1; ++ n) { Chris@16: #ifndef BOOST_UBLAS_SINGULAR_CHECK Chris@16: BOOST_UBLAS_CHECK (e1 () (n, n) != value_type/*zero*/(), singular ()); Chris@16: #else Chris@16: if (e1 () (n, n) == value_type/*zero*/()) Chris@16: singular ().raise (); Chris@16: #endif Chris@16: for (size_type l = 0; l < size2; ++ l) { Chris@16: value_type t = e2 () (n, l) /= e1 () (n, n); Chris@16: if (t != value_type/*zero*/()) { Chris@16: for (size_type m = n + 1; m < size1; ++ m) Chris@16: e2 () (m, l) -= e1 () (m, n) * t; Chris@16: } Chris@16: } Chris@16: } Chris@16: } Chris@16: // Packed (proxy) case Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void inplace_solve (const matrix_expression &e1, matrix_expression &e2, Chris@16: lower_tag, packed_proxy_tag) { Chris@16: typedef typename E2::size_type size_type; Chris@16: typedef typename E2::difference_type difference_type; Chris@16: typedef typename E2::value_type value_type; Chris@16: Chris@16: BOOST_UBLAS_CHECK (e1 ().size1 () == e1 ().size2 (), bad_size ()); Chris@16: BOOST_UBLAS_CHECK (e1 ().size2 () == e2 ().size1 (), bad_size ()); Chris@16: size_type size1 = e2 ().size1 (); Chris@16: size_type size2 = e2 ().size2 (); Chris@16: for (size_type n = 0; n < size1; ++ n) { Chris@16: #ifndef BOOST_UBLAS_SINGULAR_CHECK Chris@16: BOOST_UBLAS_CHECK (e1 () (n, n) != value_type/*zero*/(), singular ()); Chris@16: #else Chris@16: if (e1 () (n, n) == value_type/*zero*/()) Chris@16: singular ().raise (); Chris@16: #endif Chris@16: for (size_type l = 0; l < size2; ++ l) { Chris@16: value_type t = e2 () (n, l) /= e1 () (n, n); Chris@16: if (t != value_type/*zero*/()) { Chris@16: typename E1::const_iterator1 it1e1 (e1 ().find1 (1, n + 1, n)); Chris@16: typename E1::const_iterator1 it1e1_end (e1 ().find1 (1, e1 ().size1 (), n)); Chris@16: difference_type m (it1e1_end - it1e1); Chris@16: while (-- m >= 0) Chris@16: e2 () (it1e1.index1 (), l) -= *it1e1 * t, ++ it1e1; Chris@16: } Chris@16: } Chris@16: } Chris@16: } Chris@16: // Sparse (proxy) case Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void inplace_solve (const matrix_expression &e1, matrix_expression &e2, Chris@16: lower_tag, unknown_storage_tag) { Chris@16: typedef typename E2::size_type size_type; Chris@16: typedef typename E2::value_type value_type; Chris@16: Chris@16: BOOST_UBLAS_CHECK (e1 ().size1 () == e1 ().size2 (), bad_size ()); Chris@16: BOOST_UBLAS_CHECK (e1 ().size2 () == e2 ().size1 (), bad_size ()); Chris@16: size_type size1 = e2 ().size1 (); Chris@16: size_type size2 = e2 ().size2 (); Chris@16: for (size_type n = 0; n < size1; ++ n) { Chris@16: #ifndef BOOST_UBLAS_SINGULAR_CHECK Chris@16: BOOST_UBLAS_CHECK (e1 () (n, n) != value_type/*zero*/(), singular ()); Chris@16: #else Chris@16: if (e1 () (n, n) == value_type/*zero*/()) Chris@16: singular ().raise (); Chris@16: #endif Chris@16: for (size_type l = 0; l < size2; ++ l) { Chris@16: value_type t = e2 () (n, l) /= e1 () (n, n); Chris@16: if (t != value_type/*zero*/()) { Chris@16: typename E1::const_iterator1 it1e1 (e1 ().find1 (1, n + 1, n)); Chris@16: typename E1::const_iterator1 it1e1_end (e1 ().find1 (1, e1 ().size1 (), n)); Chris@16: while (it1e1 != it1e1_end) Chris@16: e2 () (it1e1.index1 (), l) -= *it1e1 * t, ++ it1e1; Chris@16: } Chris@16: } Chris@16: } Chris@16: } Chris@16: // Dispatcher Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void inplace_solve (const matrix_expression &e1, matrix_expression &e2, Chris@16: lower_tag) { Chris@16: typedef typename E1::storage_category dispatch_category; Chris@16: inplace_solve (e1, e2, Chris@16: lower_tag (), dispatch_category ()); Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void inplace_solve (const matrix_expression &e1, matrix_expression &e2, Chris@16: unit_lower_tag) { Chris@16: typedef typename E1::storage_category dispatch_category; Chris@16: inplace_solve (triangular_adaptor (e1 ()), e2, Chris@16: unit_lower_tag (), dispatch_category ()); Chris@16: } Chris@16: Chris@16: // Dense (proxy) case Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void inplace_solve (const matrix_expression &e1, matrix_expression &e2, Chris@16: upper_tag, dense_proxy_tag) { Chris@16: typedef typename E2::size_type size_type; Chris@16: typedef typename E2::difference_type difference_type; Chris@16: typedef typename E2::value_type value_type; Chris@16: Chris@16: BOOST_UBLAS_CHECK (e1 ().size1 () == e1 ().size2 (), bad_size ()); Chris@16: BOOST_UBLAS_CHECK (e1 ().size2 () == e2 ().size1 (), bad_size ()); Chris@16: size_type size1 = e2 ().size1 (); Chris@16: size_type size2 = e2 ().size2 (); Chris@16: for (difference_type n = size1 - 1; n >= 0; -- n) { Chris@16: #ifndef BOOST_UBLAS_SINGULAR_CHECK Chris@16: BOOST_UBLAS_CHECK (e1 () (n, n) != value_type/*zero*/(), singular ()); Chris@16: #else Chris@16: if (e1 () (n, n) == value_type/*zero*/()) Chris@16: singular ().raise (); Chris@16: #endif Chris@16: for (difference_type l = size2 - 1; l >= 0; -- l) { Chris@16: value_type t = e2 () (n, l) /= e1 () (n, n); Chris@16: if (t != value_type/*zero*/()) { Chris@16: for (difference_type m = n - 1; m >= 0; -- m) Chris@16: e2 () (m, l) -= e1 () (m, n) * t; Chris@16: } Chris@16: } Chris@16: } Chris@16: } Chris@16: // Packed (proxy) case Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void inplace_solve (const matrix_expression &e1, matrix_expression &e2, Chris@16: upper_tag, packed_proxy_tag) { Chris@16: typedef typename E2::size_type size_type; Chris@16: typedef typename E2::difference_type difference_type; Chris@16: typedef typename E2::value_type value_type; Chris@16: Chris@16: BOOST_UBLAS_CHECK (e1 ().size1 () == e1 ().size2 (), bad_size ()); Chris@16: BOOST_UBLAS_CHECK (e1 ().size2 () == e2 ().size1 (), bad_size ()); Chris@16: size_type size1 = e2 ().size1 (); Chris@16: size_type size2 = e2 ().size2 (); Chris@16: for (difference_type n = size1 - 1; n >= 0; -- n) { Chris@16: #ifndef BOOST_UBLAS_SINGULAR_CHECK Chris@16: BOOST_UBLAS_CHECK (e1 () (n, n) != value_type/*zero*/(), singular ()); Chris@16: #else Chris@16: if (e1 () (n, n) == value_type/*zero*/()) Chris@16: singular ().raise (); Chris@16: #endif Chris@16: for (difference_type l = size2 - 1; l >= 0; -- l) { Chris@16: value_type t = e2 () (n, l) /= e1 () (n, n); Chris@16: if (t != value_type/*zero*/()) { Chris@16: typename E1::const_reverse_iterator1 it1e1 (e1 ().find1 (1, n, n)); Chris@16: typename E1::const_reverse_iterator1 it1e1_rend (e1 ().find1 (1, 0, n)); Chris@16: difference_type m (it1e1_rend - it1e1); Chris@16: while (-- m >= 0) Chris@16: e2 () (it1e1.index1 (), l) -= *it1e1 * t, ++ it1e1; Chris@16: } Chris@16: } Chris@16: } Chris@16: } Chris@16: // Sparse (proxy) case Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void inplace_solve (const matrix_expression &e1, matrix_expression &e2, Chris@16: upper_tag, unknown_storage_tag) { Chris@16: typedef typename E2::size_type size_type; Chris@16: typedef typename E2::difference_type difference_type; Chris@16: typedef typename E2::value_type value_type; Chris@16: Chris@16: BOOST_UBLAS_CHECK (e1 ().size1 () == e1 ().size2 (), bad_size ()); Chris@16: BOOST_UBLAS_CHECK (e1 ().size2 () == e2 ().size1 (), bad_size ()); Chris@16: size_type size1 = e2 ().size1 (); Chris@16: size_type size2 = e2 ().size2 (); Chris@16: for (difference_type n = size1 - 1; n >= 0; -- n) { Chris@16: #ifndef BOOST_UBLAS_SINGULAR_CHECK Chris@16: BOOST_UBLAS_CHECK (e1 () (n, n) != value_type/*zero*/(), singular ()); Chris@16: #else Chris@16: if (e1 () (n, n) == value_type/*zero*/()) Chris@16: singular ().raise (); Chris@16: #endif Chris@16: for (difference_type l = size2 - 1; l >= 0; -- l) { Chris@16: value_type t = e2 () (n, l) /= e1 () (n, n); Chris@16: if (t != value_type/*zero*/()) { Chris@16: typename E1::const_reverse_iterator1 it1e1 (e1 ().find1 (1, n, n)); Chris@16: typename E1::const_reverse_iterator1 it1e1_rend (e1 ().find1 (1, 0, n)); Chris@16: while (it1e1 != it1e1_rend) Chris@16: e2 () (it1e1.index1 (), l) -= *it1e1 * t, ++ it1e1; Chris@16: } Chris@16: } Chris@16: } Chris@16: } Chris@16: // Dispatcher Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void inplace_solve (const matrix_expression &e1, matrix_expression &e2, Chris@16: upper_tag) { Chris@16: typedef typename E1::storage_category dispatch_category; Chris@16: inplace_solve (e1, e2, Chris@16: upper_tag (), dispatch_category ()); Chris@16: } Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: void inplace_solve (const matrix_expression &e1, matrix_expression &e2, Chris@16: unit_upper_tag) { Chris@16: typedef typename E1::storage_category dispatch_category; Chris@16: inplace_solve (triangular_adaptor (e1 ()), e2, Chris@16: unit_upper_tag (), dispatch_category ()); Chris@16: } Chris@16: Chris@16: template Chris@16: BOOST_UBLAS_INLINE Chris@16: typename matrix_matrix_solve_traits::result_type Chris@16: solve (const matrix_expression &e1, Chris@16: const matrix_expression &e2, Chris@16: C) { Chris@16: typename matrix_matrix_solve_traits::result_type r (e2); Chris@16: inplace_solve (e1, r, C ()); Chris@16: return r; Chris@16: } Chris@16: Chris@16: }}} Chris@16: Chris@16: #endif