Update of /cvsroot/boost/boost/boost/numeric/ublas
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15404
Modified Files:
matrix.hpp
Log Message:
- fix bug in vector_of_vector by replacing old 'size1' and 'size2'
with new 'size_M' and 'size_m'
Index: matrix.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/numeric/ublas/matrix.hpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- matrix.hpp 6 Dec 2006 09:34:01 -0000 1.72
+++ matrix.hpp 16 Mar 2007 21:17:54 -0000 1.73
@@ -1054,9 +1054,9 @@
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 @@
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 @@
// 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*/());
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
