GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-07-18 10:54:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

forward resize() function from Array/Matrix-Wrapper to the nested expression such that mat.array().resize(a,b) is now allowed.

Browse Source
This commit is contained in:
Gael Guennebaud 2012-08-30 16:28:53 +02:00
parent c5031edb92
commit 9da41cc527
2 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Eigen/src/Core/ArrayWrapper.h
View File

@ -121,6 +121,13 @@ class ArrayWrapper : public ArrayBase<ArrayWrapper<ExpressionType> >
return m_expression; return m_expression;
} }
/** Forwards the resizing request to the nested expression
* \sa DenseBase::resize(Index) */
void resize(Index newSize) { m_expression.const_cast_derived().resize(newSize); }
/** Forwards the resizing request to the nested expression
* \sa DenseBase::resize(Index,Index)*/
void resize(Index nbRows, Index nbCols) { m_expression.const_cast_derived().resize(nbRows,nbCols); }
protected: protected:
NestedExpressionType m_expression; NestedExpressionType m_expression;
}; };
@ -231,6 +238,13 @@ class MatrixWrapper : public MatrixBase<MatrixWrapper<ExpressionType> >
return m_expression; return m_expression;
} }
/** Forwards the resizing request to the nested expression
* \sa DenseBase::resize(Index) */
void resize(Index newSize) { m_expression.const_cast_derived().resize(newSize); }
/** Forwards the resizing request to the nested expression
* \sa DenseBase::resize(Index,Index)*/
void resize(Index nbRows, Index nbCols) { m_expression.const_cast_derived().resize(nbRows,nbCols); }
protected: protected:
NestedExpressionType m_expression; NestedExpressionType m_expression;
}; };

31
test/array_for_matrix.cpp
View File

@ -170,6 +170,32 @@ template<typename MatrixType> void cwise_min_max(const MatrixType& m)
} }
template<typename MatrixTraits> void resize(const MatrixTraits& t)
{
typedef typename MatrixTraits::Index Index;
typedef typename MatrixTraits::Scalar Scalar;
typedef Matrix<Scalar,Dynamic,Dynamic> MatrixType;
typedef Array<Scalar,Dynamic,Dynamic> Array2DType;
typedef Matrix<Scalar,Dynamic,1> VectorType;
typedef Array<Scalar,Dynamic,1> Array1DType;
Index rows = t.rows(), cols = t.cols();
MatrixType m(rows,cols);
VectorType v(rows);
Array2DType a2(rows,cols);
Array1DType a1(rows);
m.array().resize(rows+1,cols+1);
VERIFY(m.rows()==rows+1 && m.cols()==cols+1);
a2.matrix().resize(rows+1,cols+1);
VERIFY(a2.rows()==rows+1 && a2.cols()==cols+1);
v.array().resize(cols);
VERIFY(v.size()==cols);
a1.matrix().resize(cols);
VERIFY(a1.size()==cols);
}
void test_array_for_matrix() void test_array_for_matrix()
{ {
for(int i = 0; i < g_repeat; i++) { for(int i = 0; i < g_repeat; i++) {
@ -202,4 +228,9 @@ void test_array_for_matrix()
CALL_SUBTEST_5( lpNorm(VectorXf(internal::random<int>(1,EIGEN_TEST_MAX_SIZE))) ); CALL_SUBTEST_5( lpNorm(VectorXf(internal::random<int>(1,EIGEN_TEST_MAX_SIZE))) );
CALL_SUBTEST_4( lpNorm(VectorXcf(internal::random<int>(1,EIGEN_TEST_MAX_SIZE))) ); CALL_SUBTEST_4( lpNorm(VectorXcf(internal::random<int>(1,EIGEN_TEST_MAX_SIZE))) );
} }
for(int i = 0; i < g_repeat; i++) {
CALL_SUBTEST_4( resize(MatrixXcf(internal::random<int>(1,EIGEN_TEST_MAX_SIZE), internal::random<int>(1,EIGEN_TEST_MAX_SIZE))) );
CALL_SUBTEST_5( resize(MatrixXf(internal::random<int>(1,EIGEN_TEST_MAX_SIZE), internal::random<int>(1,EIGEN_TEST_MAX_SIZE))) );
CALL_SUBTEST_6( resize(MatrixXi(internal::random<int>(1,EIGEN_TEST_MAX_SIZE), internal::random<int>(1,EIGEN_TEST_MAX_SIZE))) );
}
} }