GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-09-15 19:03:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

compilation fix for conservativeResize

Browse Source
This commit is contained in:
Gael Guennebaud 2009-09-04 09:26:00 +02:00
parent 68b28f7bfb
commit 3fbf71d6b9
1 changed files with 61 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,6 +126,7 @@ class Matrix
EIGEN_GENERIC_PUBLIC_INTERFACE(Matrix) EIGEN_GENERIC_PUBLIC_INTERFACE(Matrix)
enum { Options = _Options }; enum { Options = _Options };
typedef typename Base::PlainMatrixType PlainMatrixType;
friend class Eigen::Map<Matrix, Unaligned>; friend class Eigen::Map<Matrix, Unaligned>;
typedef class Eigen::Map<Matrix, Unaligned> UnalignedMapType; typedef class Eigen::Map<Matrix, Unaligned> UnalignedMapType;
friend class Eigen::Map<Matrix, Aligned>; friend class Eigen::Map<Matrix, Aligned>;
@ -321,65 +322,65 @@ class Matrix
else resize(other.rows(), other.cols()); else resize(other.rows(), other.cols());
} }
/** Resizes \c *this to a \a rows x \a cols matrix while leaving old values of *this untouched. /** Resizes \c *this to a \a rows x \a cols matrix while leaving old values of *this untouched.
* *
* This method is intended for dynamic-size matrices, although it is legal to call it on any * This method is intended for dynamic-size matrices, although it is legal to call it on any
* matrix as long as fixed dimensions are left unchanged. If you only want to change the number * matrix as long as fixed dimensions are left unchanged. If you only want to change the number
* of rows and/or of columns, you can use conservativeResize(NoChange_t, int), * of rows and/or of columns, you can use conservativeResize(NoChange_t, int),
* conservativeResize(int, NoChange_t). * conservativeResize(int, NoChange_t).
* *
* 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 per * of *this. In case values need to be appended to the matrix they will be uninitialized per
* default and set to zero when init_with_zero is set to true. * default and set to zero when init_with_zero is set to true.
*/ */
inline void conservativeResize(int rows, int cols, bool init_with_zero = false) inline void conservativeResize(int rows, int cols, bool init_with_zero = false)
{ {
// Note: Here is space for improvement. Basically, for conservativeResize(int,int), // Note: Here is space for improvement. Basically, for conservativeResize(int,int),
// neither RowsAtCompileTime or ColsAtCompileTime must be Dynamic. If only one of the // 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 // 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 // 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_ROWS and EIGEN_STATIC_ASSERT_DYNAMIC_COLS would be good.
EIGEN_STATIC_ASSERT_DYNAMIC_SIZE(Matrix) EIGEN_STATIC_ASSERT_DYNAMIC_SIZE(Matrix)
PlainMatrixType tmp = init_with_zero ? PlainMatrixType::Zero(rows, cols) : PlainMatrixType(rows,cols); PlainMatrixType tmp = init_with_zero ? PlainMatrixType::Zero(rows, cols) : PlainMatrixType(rows,cols);
const int common_rows = std::min(rows, this->rows()); const int common_rows = std::min(rows, this->rows());
const int common_cols = std::min(cols, this->cols()); 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); tmp.block(0,0,common_rows,common_cols) = this->block(0,0,common_rows,common_cols);
this->derived().swap(tmp); this->derived().swap(tmp);
} }
EIGEN_STRONG_INLINE void conservativeResize(int rows, NoChange_t, bool init_with_zero = false) EIGEN_STRONG_INLINE void conservativeResize(int rows, NoChange_t, bool init_with_zero = false)
{ {
// Note: see the comment in conservativeResize(int,int,bool) // Note: see the comment in conservativeResize(int,int,bool)
conservativeResize(rows, cols(), init_with_zero); conservativeResize(rows, cols(), init_with_zero);
} }
EIGEN_STRONG_INLINE void conservativeResize(NoChange_t, int cols, bool init_with_zero = false) EIGEN_STRONG_INLINE void conservativeResize(NoChange_t, int cols, bool init_with_zero = false)
{ {
// Note: see the comment in conservativeResize(int,int,bool) // Note: see the comment in conservativeResize(int,int,bool)
conservativeResize(rows(), cols, init_with_zero); conservativeResize(rows(), cols, init_with_zero);
} }
/** Resizes \c *this to a vector of length \a size while retaining old values of *this. /** Resizes \c *this to a vector of length \a size while retaining old values of *this.
* *
* \only_for_vectors. This method does not work for * \only_for_vectors. This method does not work for
* partially dynamic matrices when the static dimension is anything other * partially dynamic matrices when the static dimension is anything other
* than 1. For example it will not work with Matrix<double, 2, Dynamic>. * than 1. For example it will not work with Matrix<double, 2, Dynamic>.
* *
* When values are appended, they will be uninitialized per default and set * When values are appended, they will be uninitialized per default and set
* to zero when init_with_zero is set to true. * to zero when init_with_zero is set to true.
*/ */
inline void conservativeResize(int size, bool init_with_zero = false) inline void conservativeResize(int size, bool init_with_zero = false)
{ {
EIGEN_STATIC_ASSERT_VECTOR_ONLY(Matrix) EIGEN_STATIC_ASSERT_VECTOR_ONLY(Matrix)
EIGEN_STATIC_ASSERT_DYNAMIC_SIZE(Matrix) EIGEN_STATIC_ASSERT_DYNAMIC_SIZE(Matrix)
if (RowsAtCompileTime == 1 || ColsAtCompileTime == 1) if (RowsAtCompileTime == 1 || ColsAtCompileTime == 1)
{ {
PlainMatrixType tmp = init_with_zero ? PlainMatrixType::Zero(size) : PlainMatrixType(size); PlainMatrixType tmp = init_with_zero ? PlainMatrixType::Zero(size) : PlainMatrixType(size);
const int common_size = std::min<int>(this->size(),size); const int common_size = std::min<int>(this->size(),size);
tmp.segment(0,common_size) = this->segment(0,common_size); tmp.segment(0,common_size) = this->segment(0,common_size);
this->derived().swap(tmp); this->derived().swap(tmp);
} }
} }
/** Copies the value of the expression \a other into \c *this with automatic resizing. /** Copies the value of the expression \a other into \c *this with automatic resizing.
@ -711,7 +712,7 @@ class Matrix
m_storage.data()[0] = x; m_storage.data()[0] = x;
m_storage.data()[1] = y; m_storage.data()[1] = y;
} }
template<typename MatrixType, typename OtherDerived, bool IsSameType, bool IsDynamicSize> template<typename MatrixType, typename OtherDerived, bool IsSameType, bool IsDynamicSize>
friend struct ei_matrix_swap_impl; friend struct ei_matrix_swap_impl;
}; };