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

detail::resize not required anymore

Browse Source 
svn path=/trunk/boost/boost/numeric/ublas/; revision=25276
This commit is contained in:
Michael Stevens
2004-09-20 13:41:25 +00:00
parent 03f043c9c5
commit 770e97673c
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -153,7 +153,7 @@ namespace boost { namespace numeric { namespace ublas {
assign_temporary (temporary);
}
else {
detail::resize (data (), functor_type::storage_size (size1, size2), preserve);
data ().resize (functor_type::storage_size (size1, size2));
size1_ = size1;
size2_ = size2;
}
@@ -1066,7 +1066,7 @@ namespace boost { namespace numeric { namespace ublas {
matrix_expression<self_type> (),
size1_ (ae ().size1 ()), size2_ (ae ().size2 ()), data_ (functor_type::size1 (size1_, size2_) + 1) {
for (size_type k = 0; k < functor_type::size1 (size1_, size2_); ++ k)
detail::resize (data () [k], functor_type::size2 (size1_, size2_), false);
data ()[k].resize (functor_type::size2 (size1_, size2_));
matrix_assign (scalar_assign<reference, BOOST_UBLAS_TYPENAME AE::value_type> (), *this, ae);
}
@@ -1093,9 +1093,16 @@ namespace boost { namespace numeric { namespace ublas {
void resize (size_type size1, size_type size2, bool preserve = true) {
size1_ = size1;
size2_ = size2;
detail::resize (data (), functor_type::size1 (size1, size2) + 1, preserve);
for (size_type k = 0; k < functor_type::size1 (size1, size2); ++ k)
detail::resize (data () [k], functor_type::size2 (size1, size2), preserve);
if (preserve)
data ().resize (functor_type::size1 (size1, size2) + 1, BOOST_UBLAS_TYPENAME array_type::value_type ());
else
data ().resize (functor_type::size1 (size1, size2) + 1);
for (size_type k = 0; k < functor_type::size1 (size1, size2); ++ k) {
if (preserve)
data () [k].resize (functor_type::size2 (size1, size2), value_type ());
else
data () [k].resize (functor_type::size2 (size1, size2));
}
}
// Element access