GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-07-09 06:31:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug #654: allow implicit transposition in Array to Matrix and Matrix to Array constructors

Browse Source 
(grafted from 07417bd03f501efd276302123eb77b2f5a1a67b7
)
This commit is contained in:
Gael Guennebaud 2013-09-07 00:01:04 +02:00
parent 811ec5bfcb
commit a443b3d98d
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Eigen/src/Core/Array.h
View File

@ -210,7 +210,7 @@ class Array
: Base(other.derived().rows() * other.derived().cols(), other.derived().rows(), other.derived().cols()) : Base(other.derived().rows() * other.derived().cols(), other.derived().rows(), other.derived().cols())
{ {
Base::_check_template_params(); Base::_check_template_params();
Base::resize(other.rows(), other.cols()); Base::_resize_to_match(other);
*this = other; *this = other;
} }

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

@ -304,7 +304,7 @@ class Matrix
: Base(other.derived().rows() * other.derived().cols(), other.derived().rows(), other.derived().cols()) : Base(other.derived().rows() * other.derived().cols(), other.derived().rows(), other.derived().cols())
{ {
Base::_check_template_params(); Base::_check_template_params();
Base::resize(other.rows(), other.cols()); Base::_resize_to_match(other);
// FIXME/CHECK: isn't *this = other.derived() more efficient. it allows to // FIXME/CHECK: isn't *this = other.derived() more efficient. it allows to
// go for pure _set() implementations, right? // go for pure _set() implementations, right?
*this = other; *this = other;

7
test/array_for_matrix.cpp
View File

@ -202,6 +202,12 @@ template<typename MatrixTraits> void resize(const MatrixTraits& t)
VERIFY(a1.size()==cols); VERIFY(a1.size()==cols);
} }
void regression_bug_654()
{
ArrayXf a = RowVectorXf(3);
VectorXf v = Array<float,1,Dynamic>(3);
}
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++) {
@ -239,4 +245,5 @@ void test_array_for_matrix()
CALL_SUBTEST_5( resize(MatrixXf(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))) ); CALL_SUBTEST_6( resize(MatrixXi(internal::random<int>(1,EIGEN_TEST_MAX_SIZE), internal::random<int>(1,EIGEN_TEST_MAX_SIZE))) );
} }
CALL_SUBTEST_6( regression_bug_654() );
} }