2
0
mirror of https://github.com/boostorg/ublas.git synced 2026-02-21 15:32:12 +00:00

cosmetic changes after patch on assignment

This commit is contained in:
David Bellot
2013-06-01 11:18:48 +00:00
parent c28cd94c9a
commit 8c27fa0366
2 changed files with 629 additions and 614 deletions

View File

@@ -1,8 +1,14 @@
// Copyright (c) 2000-2011 Joerg Walter, Mathias Koch, Gunter Winkler, David Bellot
//
// Copyright (c) 2000-2010
// Joerg Walter, Mathias Koch, Gunter Winkler, David Bellot
//
// Distributed under the Boost Software License, Version 1.0. (See
// accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
//
// The authors gratefully acknowledge the support of
// GeNeSys mbH & Co. KG in producing this work.
//
#ifndef _BOOST_UBLAS_MATRIX_
#define _BOOST_UBLAS_MATRIX_
@@ -17,21 +23,21 @@
// Iterators based on ideas of Jeremy Siek
namespace boost { namespace numeric {
/** \brief main namespace of uBLAS.
*
* Use this namespace for all operations with uBLAS. It can also be abbreviated with
* \code namespace ublas = boost::numeric::ublas; \endcode
*
* A common practice is to bring this namespace into the current scope with
* \code using namespace boost::numeric::ublas; \endcode.
*
* However, be warned that using the ublas namespace and the std::vector at the same time can lead to the compiler to confusion.
* The solution is simply to prefix each ublas vector like \c boost::numeric::ublas::vector<T>. If you think it's too long to
* write, you can define a new namespace like \c namespace ublas = boost::numeric::ublas and then just declare your vectors
* with \c ublas::vector<T>. STL vectors will be declared as vector<T>. No need to prefix with \c std::
*/
namespace ublas {
/** \brief main namespace of uBLAS.
*
* Use this namespace for all operations with uBLAS. It can also be abbreviated with
* \code namespace ublas = boost::numeric::ublas; \endcode
*
* A common practice is to bring this namespace into the current scope with
* \code using namespace boost::numeric::ublas; \endcode.
*
* However, be warned that using the ublas namespace and the std::vector at the same time can lead to the compiler to confusion.
* The solution is simply to prefix each ublas vector like \c boost::numeric::ublas::vector<T>. If you think it's too long to
* write, you can define a new namespace like \c namespace ublas = boost::numeric::ublas and then just declare your vectors
* with \c ublas::vector<T>. STL vectors will be declared as vector<T>. No need to prefix with \c std::
*/
namespace ublas {
namespace detail {
using namespace boost::numeric::ublas;
@@ -108,54 +114,54 @@ namespace boost { namespace numeric {
typedef typename L::orientation_category orientation_category;
// Construction and destruction
/// Default dense matrix constructor. Make a dense matrix of size (0,0)
BOOST_UBLAS_INLINE
matrix ():
matrix_container<self_type> (),
size1_ (0), size2_ (0), data_ () {}
/// Default dense matrix constructor. Make a dense matrix of size (0,0)
BOOST_UBLAS_INLINE
matrix ():
matrix_container<self_type> (),
size1_ (0), size2_ (0), data_ () {}
/** Dense matrix constructor with defined size
* \param size1 number of rows
* \param size2 number of columns
*/
BOOST_UBLAS_INLINE
matrix (size_type size1, size_type size2):
matrix_container<self_type> (),
size1_ (size1), size2_ (size2), data_ (layout_type::storage_size (size1, size2)) {
}
/** Dense matrix constructor with defined size a initial value for all the matrix elements
* \param size1 number of rows
* \param size2 number of columns
* \param init initial value assigned to all elements
*/
matrix (size_type size1, size_type size2, const value_type &init):
matrix_container<self_type> (),
size1_ (size1), size2_ (size2), data_ (layout_type::storage_size (size1, size2), init) {
}
/** Dense matrix constructor with defined size
* \param size1 number of rows
* \param size2 number of columns
*/
BOOST_UBLAS_INLINE
matrix (size_type size1, size_type size2):
matrix_container<self_type> (),
size1_ (size1), size2_ (size2), data_ (layout_type::storage_size (size1, size2)) {
}
/** Dense matrix constructor with defined size a initial value for all the matrix elements
* \param size1 number of rows
* \param size2 number of columns
* \param init initial value assigned to all elements
*/
matrix (size_type size1, size_type size2, const value_type &init):
matrix_container<self_type> (),
size1_ (size1), size2_ (size2), data_ (layout_type::storage_size (size1, size2), init) {
}
/** Dense matrix constructor with defined size and an initial data array
* \param size1 number of rows
* \param size2 number of columns
* \param data array to copy into the matrix. Must have the same dimension as the matrix
*/
/** Dense matrix constructor with defined size and an initial data array
* \param size1 number of rows
* \param size2 number of columns
* \param data array to copy into the matrix. Must have the same dimension as the matrix
*/
BOOST_UBLAS_INLINE
matrix (size_type size1, size_type size2, const array_type &data):
matrix_container<self_type> (),
size1_ (size1), size2_ (size2), data_ (data) {}
/** Copy-constructor of a dense matrix
* \param m is a dense matrix
*/
/** Copy-constructor of a dense matrix
* \param m is a dense matrix
*/
BOOST_UBLAS_INLINE
matrix (const matrix &m):
matrix_container<self_type> (),
size1_ (m.size1_), size2_ (m.size2_), data_ (m.data_) {}
/** Copy-constructor of a dense matrix from a matrix expression
* \param ae is a matrix expression
*/
/** Copy-constructor of a dense matrix from a matrix expression
* \param ae is a matrix expression
*/
template<class AE>
BOOST_UBLAS_INLINE
matrix (const matrix_expression<AE> &ae):
@@ -165,46 +171,46 @@ namespace boost { namespace numeric {
}
// Accessors
/** Return the number of rows of the matrix
* You can also use the free size<>() function in operation/size.hpp as size<1>(m) where m is a matrix
*/
/** Return the number of rows of the matrix
* You can also use the free size<>() function in operation/size.hpp as size<1>(m) where m is a matrix
*/
BOOST_UBLAS_INLINE
size_type size1 () const {
return size1_;
}
/** Return the number of colums of the matrix
* You can also use the free size<>() function in operation/size.hpp as size<2>(m) where m is a matrix
*/
/** Return the number of colums of the matrix
* You can also use the free size<>() function in operation/size.hpp as size<2>(m) where m is a matrix
*/
BOOST_UBLAS_INLINE
size_type size2 () const {
return size2_;
}
// Storage accessors
/** Return a constant reference to the internal storage of a dense matrix, i.e. the raw data
* It's type depends on the type used by the matrix to store its data
*/
/** Return a constant reference to the internal storage of a dense matrix, i.e. the raw data
* It's type depends on the type used by the matrix to store its data
*/
BOOST_UBLAS_INLINE
const array_type &data () const {
return data_;
}
/** Return a reference to the internal storage of a dense matrix, i.e. the raw data
* It's type depends on the type used by the matrix to store its data
*/
/** Return a reference to the internal storage of a dense matrix, i.e. the raw data
* It's type depends on the type used by the matrix to store its data
*/
BOOST_UBLAS_INLINE
array_type &data () {
return data_;
}
// Resizing
/** Resize a matrix to new dimensions
* If data are preserved, then if the size if bigger at least on one dimension, extra values are filled with zeros.
* If data are not preserved, then nothing has to be assumed regarding the content of the matrix after resizing.
* \param size1 the new number of rows
* \param size2 the new number of colums
* \param preserve a boolean to say if one wants the data to be preserved during the resizing. Default is true.
*/
/** Resize a matrix to new dimensions
* If data are preserved, then if the size if bigger at least on one dimension, extra values are filled with zeros.
* If data are not preserved, then nothing has to be assumed regarding the content of the matrix after resizing.
* \param size1 the new number of rows
* \param size2 the new number of colums
* \param preserve a boolean to say if one wants the data to be preserved during the resizing. Default is true.
*/
BOOST_UBLAS_INLINE
void resize (size_type size1, size_type size2, bool preserve = true) {
if (preserve) {
@@ -251,7 +257,7 @@ namespace boost { namespace numeric {
}
// Element assignment
/** Change the value of a matrix element. Return back a reference to it
* \param i the first coordinate of the element. By default it's the row
* \param j the second coordinate of the element. By default it's the column

File diff suppressed because it is too large Load Diff