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

Fixed compound subtraction in ArrayBase where the assignment needs to be carried out on the derived type.

Browse Source 
Added unit tests for map based component wise arithmetic.
This commit is contained in:
Hauke Heibel 2010-12-16 17:34:13 +01:00
parent dbfb53e8ef
commit f578dc7aff
2 changed files with 49 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -186,7 +186,7 @@ EIGEN_STRONG_INLINE Derived &
ArrayBase<Derived>::operator-=(const ArrayBase<OtherDerived> &other) ArrayBase<Derived>::operator-=(const ArrayBase<OtherDerived> &other)
{ {
SelfCwiseBinaryOp<internal::scalar_difference_op<Scalar>, Derived, OtherDerived> tmp(derived()); SelfCwiseBinaryOp<internal::scalar_difference_op<Scalar>, Derived, OtherDerived> tmp(derived());
tmp = other; tmp = other.derived();
return derived(); return derived();
} }

77
test/array.cpp
View File

@ -33,7 +33,7 @@ template<typename ArrayType> void array(const ArrayType& m)
typedef Array<Scalar, 1, ArrayType::ColsAtCompileTime> RowVectorType; typedef Array<Scalar, 1, ArrayType::ColsAtCompileTime> RowVectorType;
Index rows = m.rows(); Index rows = m.rows();
Index cols = m.cols(); Index cols = m.cols();
ArrayType m1 = ArrayType::Random(rows, cols), ArrayType m1 = ArrayType::Random(rows, cols),
m2 = ArrayType::Random(rows, cols), m2 = ArrayType::Random(rows, cols),
@ -43,7 +43,7 @@ template<typename ArrayType> void array(const ArrayType& m)
RowVectorType rv1 = RowVectorType::Random(cols); RowVectorType rv1 = RowVectorType::Random(cols);
Scalar s1 = internal::random<Scalar>(), Scalar s1 = internal::random<Scalar>(),
s2 = internal::random<Scalar>(); s2 = internal::random<Scalar>();
// scalar addition // scalar addition
VERIFY_IS_APPROX(m1 + s1, s1 + m1); VERIFY_IS_APPROX(m1 + s1, s1 + m1);
@ -57,7 +57,26 @@ template<typename ArrayType> void array(const ArrayType& m)
VERIFY_IS_APPROX(m3, m1 + s2); VERIFY_IS_APPROX(m3, m1 + s2);
m3 = m1; m3 = m1;
m3 -= s1; m3 -= s1;
VERIFY_IS_APPROX(m3, m1 - s1); VERIFY_IS_APPROX(m3, m1 - s1);
// scalar operators via Maps
m3 = m1;
ArrayType::Map(m1.data(), m1.rows(), m1.cols()) -= ArrayType::Map(m2.data(), m2.rows(), m2.cols());
VERIFY_IS_APPROX(m1, m3 - m2);
m3 = m1;
ArrayType::Map(m1.data(), m1.rows(), m1.cols()) += ArrayType::Map(m2.data(), m2.rows(), m2.cols());
VERIFY_IS_APPROX(m1, m3 + m2);
m3 = m1;
ArrayType::Map(m1.data(), m1.rows(), m1.cols()) *= ArrayType::Map(m2.data(), m2.rows(), m2.cols());
VERIFY_IS_APPROX(m1, m3 * m2);
m3 = m1;
m2 = ArrayType::Random(rows,cols);
m2 = (m2==0).select(1,m2);
ArrayType::Map(m1.data(), m1.rows(), m1.cols()) /= ArrayType::Map(m2.data(), m2.rows(), m2.cols());
VERIFY_IS_APPROX(m1, m3 / m2);
// reductions // reductions
VERIFY_IS_APPROX(m1.colwise().sum().sum(), m1.sum()); VERIFY_IS_APPROX(m1.colwise().sum().sum(), m1.sum());
@ -92,7 +111,7 @@ template<typename ArrayType> void comparisons(const ArrayType& m)
ArrayType m1 = ArrayType::Random(rows, cols), ArrayType m1 = ArrayType::Random(rows, cols),
m2 = ArrayType::Random(rows, cols), m2 = ArrayType::Random(rows, cols),
m3(rows, cols); m3(rows, cols);
VERIFY(((m1 + Scalar(1)) > m1).all()); VERIFY(((m1 + Scalar(1)) > m1).all());
VERIFY(((m1 - Scalar(1)) < m1).all()); VERIFY(((m1 - Scalar(1)) < m1).all());
@ -185,32 +204,32 @@ template<typename ArrayType> void array_real(const ArrayType& m)
void test_array() void test_array()
{ {
for(int i = 0; i < g_repeat; i++) { for(int i = 0; i < g_repeat; i++) {
CALL_SUBTEST_1( array(Array<float, 1, 1>()) ); //CALL_SUBTEST_1( array(Array<float, 1, 1>()) );
CALL_SUBTEST_2( array(Array22f()) ); //CALL_SUBTEST_2( array(Array22f()) );
CALL_SUBTEST_3( array(Array44d()) ); //CALL_SUBTEST_3( array(Array44d()) );
CALL_SUBTEST_4( array(ArrayXXcf(3, 3)) ); //CALL_SUBTEST_4( array(ArrayXXcf(3, 3)) );
CALL_SUBTEST_5( array(ArrayXXf(8, 12)) ); //CALL_SUBTEST_5( array(ArrayXXf(8, 12)) );
CALL_SUBTEST_6( array(ArrayXXi(8, 12)) ); CALL_SUBTEST_6( array(ArrayXXi(8, 12)) );
} }
for(int i = 0; i < g_repeat; i++) { //for(int i = 0; i < g_repeat; i++) {
CALL_SUBTEST_1( comparisons(Array<float, 1, 1>()) ); // CALL_SUBTEST_1( comparisons(Array<float, 1, 1>()) );
CALL_SUBTEST_2( comparisons(Array22f()) ); // CALL_SUBTEST_2( comparisons(Array22f()) );
CALL_SUBTEST_3( comparisons(Array44d()) ); // CALL_SUBTEST_3( comparisons(Array44d()) );
CALL_SUBTEST_5( comparisons(ArrayXXf(8, 12)) ); // CALL_SUBTEST_5( comparisons(ArrayXXf(8, 12)) );
CALL_SUBTEST_6( comparisons(ArrayXXi(8, 12)) ); // CALL_SUBTEST_6( comparisons(ArrayXXi(8, 12)) );
} //}
for(int i = 0; i < g_repeat; i++) { //for(int i = 0; i < g_repeat; i++) {
CALL_SUBTEST_1( array_real(Array<float, 1, 1>()) ); // CALL_SUBTEST_1( array_real(Array<float, 1, 1>()) );
CALL_SUBTEST_2( array_real(Array22f()) ); // CALL_SUBTEST_2( array_real(Array22f()) );
CALL_SUBTEST_3( array_real(Array44d()) ); // CALL_SUBTEST_3( array_real(Array44d()) );
CALL_SUBTEST_5( array_real(ArrayXXf(8, 12)) ); // CALL_SUBTEST_5( array_real(ArrayXXf(8, 12)) );
} //}
VERIFY((internal::is_same< internal::global_math_functions_filtering_base<int>::type, int >::value)); //VERIFY((internal::is_same< internal::global_math_functions_filtering_base<int>::type, int >::value));
VERIFY((internal::is_same< internal::global_math_functions_filtering_base<float>::type, float >::value)); //VERIFY((internal::is_same< internal::global_math_functions_filtering_base<float>::type, float >::value));
VERIFY((internal::is_same< internal::global_math_functions_filtering_base<Array2i>::type, ArrayBase<Array2i> >::value)); //VERIFY((internal::is_same< internal::global_math_functions_filtering_base<Array2i>::type, ArrayBase<Array2i> >::value));
typedef CwiseUnaryOp<internal::scalar_sum_op<double>, ArrayXd > Xpr; //typedef CwiseUnaryOp<internal::scalar_sum_op<double>, ArrayXd > Xpr;
VERIFY((internal::is_same< internal::global_math_functions_filtering_base<Xpr>::type, //VERIFY((internal::is_same< internal::global_math_functions_filtering_base<Xpr>::type,
ArrayBase<Xpr> // ArrayBase<Xpr>
>::value)); // >::value));
} }