mirror/eigen
2
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-03-31 19:00:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Matrix(int,int) constructor no longer takes default arguments.

Browse Source 
Instead, introduce Matrix() and Matrix(int); however, dynamic dimensions
are required to be specified in the constructor (we no longer default to 1)
This commit is contained in:
Benoit Jacob 2007-11-26 09:11:12 +00:00
parent 5309ef5b5e
commit a587346b47
2 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Core/Matrix.h
View File

@ -80,8 +80,9 @@ class Matrix : public Object<_Scalar, Matrix<_Scalar, _Rows, _Cols> >,
EIGEN_INHERIT_SCALAR_ASSIGNMENT_OPERATOR(Matrix, *=)
EIGEN_INHERIT_SCALAR_ASSIGNMENT_OPERATOR(Matrix, /=)
explicit Matrix(int rows = RowsAtCompileTime,
int cols = ColsAtCompileTime) : Storage(rows, cols) {}
explicit Matrix() : Storage() {}
explicit Matrix(int dim) : Storage(dim) {}
explicit Matrix(int rows, int cols) : Storage(rows, cols) {}
template<typename OtherDerived>
Matrix(const Object<Scalar, OtherDerived>& other)
: Storage(other.rows(), other.cols())

32
src/Core/MatrixStorage.h
View File

@ -44,10 +44,16 @@ class MatrixStorage
{ return ColsAtCompileTime; }
public:
MatrixStorage() {}
MatrixStorage(int dim)
{
assert((RowsAtCompileTime == 1 && ColsAtCompileTime == dim)
|| (ColsAtCompileTime == 1 && RowsAtCompileTime == dim));
}
MatrixStorage(int rows, int cols)
{
EIGEN_UNUSED(rows);
EIGEN_UNUSED(cols);
assert(RowsAtCompileTime > 0 && ColsAtCompileTime > 0
&& rows == RowsAtCompileTime && cols == ColsAtCompileTime);
}
@ -80,6 +86,12 @@ class MatrixStorage<Scalar, Dynamic, ColsAtCompileTime>
{ return ColsAtCompileTime; }
public:
MatrixStorage(int dim) : m_rows(dim)
{
assert(m_rows > 0 && ColsAtCompileTime > 0);
m_array = new Scalar[m_rows * ColsAtCompileTime];
}
MatrixStorage(int rows, int cols) : m_rows(rows)
{
assert(m_rows > 0 && cols == ColsAtCompileTime && ColsAtCompileTime > 0);
@ -88,6 +100,9 @@ class MatrixStorage<Scalar, Dynamic, ColsAtCompileTime>
~MatrixStorage()
{ delete[] m_array; }
private:
MatrixStorage();
};
template<typename Scalar, int RowsAtCompileTime>
@ -115,6 +130,12 @@ class MatrixStorage<Scalar, RowsAtCompileTime, Dynamic>
{ return m_cols; }
public:
MatrixStorage(int dim) : m_cols(dim)
{
assert(m_cols > 0 && RowsAtCompileTime > 0);
m_array = new Scalar[m_cols * RowsAtCompileTime];
}
MatrixStorage(int rows, int cols) : m_cols(cols)
{
assert(rows == RowsAtCompileTime && RowsAtCompileTime > 0 && cols > 0);
@ -123,6 +144,9 @@ class MatrixStorage<Scalar, RowsAtCompileTime, Dynamic>
~MatrixStorage()
{ delete[] m_array; }
private:
MatrixStorage();
};
template<typename Scalar>
@ -159,6 +183,10 @@ class MatrixStorage<Scalar, Dynamic, Dynamic>
~MatrixStorage()
{ delete[] m_array; }
private:
MatrixStorage();
MatrixStorage(int dim);
};
#endif // EIGEN_MATRIXSTORAGE_H