boost/ublas
2
0
Fork 0
mirror of https://github.com/boostorg/ublas.git synced 2026-02-22 03:42:19 +00:00
Code Issues Projects Releases Wiki Activity

Added a new majority_from_orientation traits type and modifed baded_adaptor to reflect the new layout scheme

Browse Source
This commit is contained in:
nasos
2013-08-02 13:27:10 -04:00
parent 5c38707425
commit b3465b4c7a
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/boost/numeric/ublas/banded.hpp
View File

@@ -245,6 +245,7 @@ public:
#endif
return zero_;
}
BOOST_UBLAS_INLINE
reference at_element (size_type i, size_type j) {
BOOST_UBLAS_CHECK (i < size1_, bad_index ());
@@ -1151,6 +1152,7 @@ public:
public matrix_expression<banded_adaptor<M> > {
typedef banded_adaptor<M> self_type;
typedef majority_from_orientation<typename M::orientation_category> closure_layout_type;
public:
#ifdef BOOST_UBLAS_ENABLE_PROXY_SHORTCUTS
using matrix_expression<self_type>::operator ();
@@ -1226,12 +1228,15 @@ public:
if (k < (std::max) (size1 (), size2 ()) &&
l < lower_ + 1 + upper_)
return data () (i, j);
#else
#elif BOOST_UBLAS_LEGACY_BANDED
size_type k = j;
size_type l = upper_ + i - j;
if (k < size2 () &&
l < lower_ + 1 + upper_)
return data () (i, j);
#else
if (hidden::banded_indexing<closure_layout_type>::valid_index(size1(), size2(), lower_, upper_, i, j))
return data () (i, j);
#endif
return zero_;
}
@@ -1245,12 +1250,15 @@ public:
if (k < (std::max) (size1 (), size2 ()) &&
l < lower_ + 1 + upper_)
return data () (i, j);
#else
#elif BOOST_UBLAS_LEGACY_BANDED
size_type k = j;
size_type l = upper_ + i - j;
if (k < size2 () &&
l < lower_ + 1 + upper_)
return data () (i, j);
#else
if (hidden::banded_indexing<closure_layout_type>::valid_index(size1(), size2(), lower_, upper_, i, j))
return data () (i, j);
#endif
#ifndef BOOST_UBLAS_REFERENCE_CONST_MEMBER
bad_index ().raise ();
@@ -1268,12 +1276,15 @@ public:
if (k < (std::max) (size1 (), size2 ()) &&
l < lower_ + 1 + upper_)
return data () (i, j);
#else
#elif BOOST_UBLAS_LEGACY_BANDED
size_type k = j;
size_type l = upper_ + i - j;
if (k < size2 () &&
l < lower_ + 1 + upper_)
return data () (i, j);
#else
if (hidden::banded_indexing<closure_layout_type>::valid_index(size1(), size2(), lower_, upper_, i, j))
return data () (i, j);
#endif
#ifndef BOOST_UBLAS_REFERENCE_CONST_MEMBER
bad_index ().raise ();

13
include/boost/numeric/ublas/traits.hpp
View File

@@ -747,6 +747,19 @@ namespace boost { namespace numeric { namespace ublas {
// Note: specializations for T[N] and T[M][N] have been moved to traits/c_array.hpp
template <class MAJORITY_TAG>
struct majority_from_orientation { };
template <>
struct majority_from_orientation<column_major_tag> {
typedef column_major type;
};
template <>
struct majority_from_orientation<row_major_tag> {
typedef row_major type;
};
}}}
#endif