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

* don't laugh, but these bugs took me forever to fix.

Browse Source 
* expand unit tests to make sure to catch them: they nearly escaped the existing tests as these memory violations were highly dependent on the numbers of rows and cols.
This commit is contained in:
Benoit Jacob 2009-11-19 22:01:13 -05:00
parent eac3232095
commit 6cbf662f14
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Eigen/src/Core/TriangularMatrix.h
View File

@ -410,7 +410,7 @@ struct ei_triangular_assignment_selector<Derived1, Derived2, StrictlyLowerTriang
{ {
for(int i = j+1; i < dst.rows(); ++i) for(int i = j+1; i < dst.rows(); ++i)
dst.copyCoeff(i, j, src); dst.copyCoeff(i, j, src);
int maxi = std::min(j, dst.rows()); int maxi = std::min(j, dst.rows()-1);
if (ClearOpposite) if (ClearOpposite)
for(int i = 0; i <= maxi; ++i) for(int i = 0; i <= maxi; ++i)
dst.coeffRef(i, j) = 0; dst.coeffRef(i, j) = 0;
@ -432,9 +432,9 @@ struct ei_triangular_assignment_selector<Derived1, Derived2, UnitUpperTriangular
{ {
for(int i = maxi+1; i < dst.rows(); ++i) for(int i = maxi+1; i < dst.rows(); ++i)
dst.coeffRef(i, j) = 0; dst.coeffRef(i, j) = 0;
dst.coeffRef(j, j) = 1;
} }
} }
dst.diagonal().setOnes();
} }
}; };
template<typename Derived1, typename Derived2, bool ClearOpposite> template<typename Derived1, typename Derived2, bool ClearOpposite>
@ -451,9 +451,9 @@ struct ei_triangular_assignment_selector<Derived1, Derived2, UnitLowerTriangular
{ {
for(int i = 0; i < maxi; ++i) for(int i = 0; i < maxi; ++i)
dst.coeffRef(i, j) = 0; dst.coeffRef(i, j) = 0;
dst.coeffRef(j, j) = 1;
} }
} }
dst.diagonal().setOnes();
} }
}; };

27
test/triangular.cpp
View File

@ -188,6 +188,7 @@ template<typename MatrixType> void triangular_rect(const MatrixType& m)
m3 = 3 * m2; m3 = 3 * m2;
VERIFY_IS_APPROX(m3.template triangularView<UpperTriangular>().toDenseMatrix(), m1); VERIFY_IS_APPROX(m3.template triangularView<UpperTriangular>().toDenseMatrix(), m1);
m1.setZero(); m1.setZero();
m1.template triangularView<LowerTriangular>() = 3 * m2; m1.template triangularView<LowerTriangular>() = 3 * m2;
VERIFY_IS_APPROX(m3.template triangularView<LowerTriangular>().toDenseMatrix(), m1); VERIFY_IS_APPROX(m3.template triangularView<LowerTriangular>().toDenseMatrix(), m1);
@ -196,10 +197,10 @@ template<typename MatrixType> void triangular_rect(const MatrixType& m)
m1.template triangularView<StrictlyUpperTriangular>() = 3 * m2; m1.template triangularView<StrictlyUpperTriangular>() = 3 * m2;
VERIFY_IS_APPROX(m3.template triangularView<StrictlyUpperTriangular>().toDenseMatrix(), m1); VERIFY_IS_APPROX(m3.template triangularView<StrictlyUpperTriangular>().toDenseMatrix(), m1);
m1.setZero(); m1.setZero();
m1.template triangularView<StrictlyLowerTriangular>() = 3 * m2; m1.template triangularView<StrictlyLowerTriangular>() = 3 * m2;
VERIFY_IS_APPROX(m3.template triangularView<StrictlyLowerTriangular>().toDenseMatrix(), m1); VERIFY_IS_APPROX(m3.template triangularView<StrictlyLowerTriangular>().toDenseMatrix(), m1);
m1.setRandom(); m1.setRandom();
m2 = m1.template triangularView<UpperTriangular>(); m2 = m1.template triangularView<UpperTriangular>();
VERIFY(m2.isUpperTriangular()); VERIFY(m2.isUpperTriangular());
@ -234,24 +235,20 @@ void test_triangular()
{ {
for(int i = 0; i < g_repeat ; i++) for(int i = 0; i < g_repeat ; i++)
{ {
EIGEN_UNUSED int r = ei_random<int>(2,20);
#ifdef EIGEN_TEST_PART_7 EIGEN_UNUSED int c = ei_random<int>(2,20);
int r = ei_random<int>(2,20);
int c = ei_random<int>(2,20);
#endif
CALL_SUBTEST_1( triangular_square(Matrix<float, 1, 1>()) ); CALL_SUBTEST_1( triangular_square(Matrix<float, 1, 1>()) );
CALL_SUBTEST_2( triangular_square(Matrix<float, 2, 2>()) ); CALL_SUBTEST_2( triangular_square(Matrix<float, 2, 2>()) );
CALL_SUBTEST_3( triangular_square(Matrix3d()) ); CALL_SUBTEST_3( triangular_square(Matrix3d()) );
CALL_SUBTEST_4( triangular_square(MatrixXcf(4, 4)) ); CALL_SUBTEST_4( triangular_square(Matrix<std::complex<float>,8, 8>()) );
CALL_SUBTEST_5( triangular_square(Matrix<std::complex<float>,8, 8>()) ); CALL_SUBTEST_5( triangular_square(MatrixXcd(r,r)) );
CALL_SUBTEST_6( triangular_square(MatrixXcd(17,17)) ); CALL_SUBTEST_6( triangular_square(Matrix<float,Dynamic,Dynamic,RowMajor>(r, r)) );
CALL_SUBTEST_7( triangular_square(Matrix<float,Dynamic,Dynamic,RowMajor>(r, r)) );
CALL_SUBTEST_8( triangular_rect(Matrix<float, 4, 5>()) ); CALL_SUBTEST_7( triangular_rect(Matrix<float, 4, 5>()) );
CALL_SUBTEST_9( triangular_rect(Matrix<double, 6, 2>()) ); CALL_SUBTEST_8( triangular_rect(Matrix<double, 6, 2>()) );
CALL_SUBTEST_4( triangular_rect(MatrixXcf(4, 10)) ); CALL_SUBTEST_9( triangular_rect(MatrixXcf(r, c)) );
CALL_SUBTEST_6( triangular_rect(MatrixXcd(11, 3)) ); CALL_SUBTEST_5( triangular_rect(MatrixXcd(r, c)) );
CALL_SUBTEST_7( triangular_rect(Matrix<float,Dynamic,Dynamic,RowMajor>(r, c)) ); CALL_SUBTEST_6( triangular_rect(Matrix<float,Dynamic,Dynamic,RowMajor>(r, c)) );
} }
} }