GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-04-22 01:29:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed unit test and improved code reusage for resizing.

Browse Source
This commit is contained in:
Hauke Heibel 2009-09-07 17:48:42 +02:00
parent e49236bac6
commit 437a79e1ab
2 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Eigen/src/Core/Matrix.h
View File

@ -331,19 +331,9 @@ class Matrix
* The top-left part of the resized matrix will be the same as the overlapping top-left corner * The top-left part of the resized matrix will be the same as the overlapping top-left corner
* of *this. In case values need to be appended to the matrix they will be uninitialized. * of *this. In case values need to be appended to the matrix they will be uninitialized.
*/ */
inline void conservativeResize(int rows, int cols) EIGEN_STRONG_INLINE void conservativeResize(int rows, int cols)
{ {
// Note: Here is space for improvement. Basically, for conservativeResize(int,int), conservativeResizeLike(PlainMatrixType(rows, cols));
// neither RowsAtCompileTime or ColsAtCompileTime must be Dynamic. If only one of the
// dimensions is dynamic, one could use either conservativeResize(int rows, NoChange_t) or
// conservativeResize(NoChange_t, int cols). For these methods new static asserts like
// EIGEN_STATIC_ASSERT_DYNAMIC_ROWS and EIGEN_STATIC_ASSERT_DYNAMIC_COLS would be good.
EIGEN_STATIC_ASSERT_DYNAMIC_SIZE(Matrix)
PlainMatrixType tmp(rows, cols);
const int common_rows = std::min(rows, this->rows());
const int common_cols = std::min(cols, this->cols());
tmp.block(0,0,common_rows,common_cols) = this->block(0,0,common_rows,common_cols);
this->derived().swap(tmp);
} }
EIGEN_STRONG_INLINE void conservativeResize(int rows, NoChange_t) EIGEN_STRONG_INLINE void conservativeResize(int rows, NoChange_t)
@ -366,19 +356,13 @@ class Matrix
* *
* When values are appended, they will be uninitialized. * When values are appended, they will be uninitialized.
*/ */
inline void conservativeResize(int size) EIGEN_STRONG_INLINE void conservativeResize(int size)
{ {
EIGEN_STATIC_ASSERT_VECTOR_ONLY(Matrix) conservativeResizeLike(PlainMatrixType(size));
EIGEN_STATIC_ASSERT_DYNAMIC_SIZE(Matrix)
PlainMatrixType tmp(size);
const int common_size = std::min<int>(this->size(),size);
tmp.segment(0,common_size) = this->segment(0,common_size);
this->derived().swap(tmp);
} }
template<typename OtherDerived> template<typename OtherDerived>
inline void conservativeResizeLike(const MatrixBase<OtherDerived>& other) EIGEN_STRONG_INLINE void conservativeResizeLike(const MatrixBase<OtherDerived>& other)
{ {
ei_conservative_resize_like_impl<Matrix, OtherDerived>::run(*this, other); ei_conservative_resize_like_impl<Matrix, OtherDerived>::run(*this, other);
} }
@ -722,6 +706,14 @@ struct ei_conservative_resize_like_impl
{ {
static void run(MatrixBase<Derived>& _this, const MatrixBase<OtherDerived>& other) static void run(MatrixBase<Derived>& _this, const MatrixBase<OtherDerived>& other)
{ {
// Note: Here is space for improvement. Basically, for conservativeResize(int,int),
// neither RowsAtCompileTime or ColsAtCompileTime must be Dynamic. If only one of the
// dimensions is dynamic, one could use either conservativeResize(int rows, NoChange_t) or
// conservativeResize(NoChange_t, int cols). For these methods new static asserts like
// EIGEN_STATIC_ASSERT_DYNAMIC_ROWS and EIGEN_STATIC_ASSERT_DYNAMIC_COLS would be good.
EIGEN_STATIC_ASSERT_DYNAMIC_SIZE(Derived)
EIGEN_STATIC_ASSERT_DYNAMIC_SIZE(OtherDerived)
MatrixBase<Derived>::PlainMatrixType tmp(other); MatrixBase<Derived>::PlainMatrixType tmp(other);
const int common_rows = std::min(tmp.rows(), _this.rows()); const int common_rows = std::min(tmp.rows(), _this.rows());
const int common_cols = std::min(tmp.cols(), _this.cols()); const int common_cols = std::min(tmp.cols(), _this.cols());
@ -735,6 +727,7 @@ struct ei_conservative_resize_like_impl<Derived,OtherDerived,true>
{ {
static void run(MatrixBase<Derived>& _this, const MatrixBase<OtherDerived>& other) static void run(MatrixBase<Derived>& _this, const MatrixBase<OtherDerived>& other)
{ {
// segment(...) will check whether Derived/OtherDerived are vectors!
MatrixBase<Derived>::PlainMatrixType tmp(other); MatrixBase<Derived>::PlainMatrixType tmp(other);
const int common_size = std::min<int>(_this.size(),tmp.size()); const int common_size = std::min<int>(_this.size(),tmp.size());
tmp.segment(0,common_size) = _this.segment(0,common_size); tmp.segment(0,common_size) = _this.segment(0,common_size);

4
test/conservative_resize.cpp
View File

@ -65,7 +65,7 @@ void run_matrix_tests()
const int rows = ei_random<int>(50,75); const int rows = ei_random<int>(50,75);
const int cols = ei_random<int>(50,75); const int cols = ei_random<int>(50,75);
m = n = MatrixType::Random(50,50); m = n = MatrixType::Random(50,50);
m.conservativeResize(rows,cols,true); m.conservativeResizeLike(MatrixType::Zero(rows,cols));
VERIFY_IS_APPROX(m.block(0,0,n.rows(),n.cols()), n); VERIFY_IS_APPROX(m.block(0,0,n.rows(),n.cols()), n);
VERIFY( rows<=50 || m.block(50,0,rows-50,cols).sum() == Scalar(0) ); VERIFY( rows<=50 || m.block(50,0,rows-50,cols).sum() == Scalar(0) );
VERIFY( cols<=50 || m.block(0,50,rows,cols-50).sum() == Scalar(0) ); VERIFY( cols<=50 || m.block(0,50,rows,cols-50).sum() == Scalar(0) );
@ -102,7 +102,7 @@ void run_vector_tests()
{ {
const int size = ei_random<int>(50,100); const int size = ei_random<int>(50,100);
m = n = MatrixType::Random(50); m = n = MatrixType::Random(50);
m.conservativeResize(size,true); m.conservativeResizeLike(MatrixType::Zero(size));
VERIFY_IS_APPROX(m.segment(0,50), n); VERIFY_IS_APPROX(m.segment(0,50), n);
VERIFY( size<=50 || m.segment(50,size-50).sum() == Scalar(0) ); VERIFY( size<=50 || m.segment(50,size-50).sum() == Scalar(0) );
} }