boost/ublas
2
0
Fork 0
mirror of https://github.com/boostorg/ublas.git synced 2026-02-21 15:32:12 +00:00
Code Issues Projects Releases Wiki Activity

- fix bug in vector_of_vector by replacing old 'size1' and 'size2'

Browse Source 
with new 'size_M' and 'size_m'


[SVN r37204]
This commit is contained in:
Gunter Winkler
2007-03-16 21:17:54 +00:00
parent 2bdbf318f5
commit bee922f7e1
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/boost/numeric/ublas/matrix.hpp
View File

@@ -1054,9 +1054,9 @@ namespace boost { namespace numeric { namespace ublas {
BOOST_UBLAS_INLINE
vector_of_vector (const matrix_expression<AE> &ae):
matrix_container<self_type> (),
size1_ (ae ().size1 ()), size2_ (ae ().size2 ()), data_ (layout_type::size1 (size1_, size2_) + 1) {
for (size_type k = 0; k < layout_type::size1 (size1_, size2_); ++ k)
data ()[k].resize (layout_type::size2 (size1_, size2_));
size1_ (ae ().size1 ()), size2_ (ae ().size2 ()), data_ (layout_type::size_M (size1_, size2_) + 1) {
for (size_type k = 0; k < layout_type::size_M (size1_, size2_); ++ k)
data ()[k].resize (layout_type::size_m (size1_, size2_));
matrix_assign<scalar_assign> (*this, ae);
}
@@ -1086,14 +1086,14 @@ namespace boost { namespace numeric { namespace ublas {
size1_ = size1;
size2_ = size2;
if (preserve)
data ().resize (layout_type::size1 (size1, size2) + 1, typename array_type::value_type ());
data ().resize (layout_type::size_M (size1, size2) + 1, typename array_type::value_type ());
else
data ().resize (layout_type::size1 (size1, size2) + 1);
for (size_type k = 0; k < layout_type::size1 (size1, size2); ++ k) {
data ().resize (layout_type::size_M (size1, size2) + 1);
for (size_type k = 0; k < layout_type::size_M (size1, size2); ++ k) {
if (preserve)
data () [k].resize (layout_type::size2 (size1, size2), value_type ());
data () [k].resize (layout_type::size_m (size1, size2), value_type ());
else
data () [k].resize (layout_type::size2 (size1, size2));
data () [k].resize (layout_type::size_m (size1, size2));
}
}
@@ -1124,7 +1124,7 @@ namespace boost { namespace numeric { namespace ublas {
// Zeroing
BOOST_UBLAS_INLINE
void clear () {
for (size_type k = 0; k < layout_type::size1 (size1_, size2_); ++ k)
for (size_type k = 0; k < layout_type::size_M (size1_, size2_); ++ k)
std::fill (data () [k].begin (), data () [k].end (), value_type/*zero*/());
}