diff options
Diffstat (limited to 'test/qr_colpivoting.cpp')
| -rw-r--r-- | test/qr_colpivoting.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/test/qr_colpivoting.cpp b/test/qr_colpivoting.cpp index 5c5c5d259..406be597d 100644 --- a/test/qr_colpivoting.cpp +++ b/test/qr_colpivoting.cpp @@ -36,7 +36,7 @@ template<typename MatrixType> void qr() typedef Matrix<Scalar, MatrixType::ColsAtCompileTime, 1> VectorType; MatrixType m1; createRandomMatrixOfRank(rank,rows,cols,m1); - ColPivotingHouseholderQR<MatrixType> qr(m1); + ColPivHouseholderQR<MatrixType> qr(m1); VERIFY_IS_APPROX(rank, qr.rank()); VERIFY(cols - qr.rank() == qr.dimensionOfKernel()); VERIFY(!qr.isInjective()); @@ -74,7 +74,7 @@ template<typename MatrixType, int Cols2> void qr_fixedsize() int rank = ei_random<int>(1, std::min(int(Rows), int(Cols))-1); Matrix<Scalar,Rows,Cols> m1; createRandomMatrixOfRank(rank,Rows,Cols,m1); - ColPivotingHouseholderQR<Matrix<Scalar,Rows,Cols> > qr(m1); + ColPivHouseholderQR<Matrix<Scalar,Rows,Cols> > qr(m1); VERIFY_IS_APPROX(rank, qr.rank()); VERIFY(Cols - qr.rank() == qr.dimensionOfKernel()); VERIFY(!qr.isInjective()); @@ -118,7 +118,7 @@ template<typename MatrixType> void qr_invertible() m1 += a * a.adjoint(); } - ColPivotingHouseholderQR<MatrixType> qr(m1); + ColPivHouseholderQR<MatrixType> qr(m1); m3 = MatrixType::Random(size,size); qr.solve(m3, &m2); VERIFY_IS_APPROX(m3, m1*m2); @@ -138,7 +138,7 @@ template<typename MatrixType> void qr_verify_assert() { MatrixType tmp; - ColPivotingHouseholderQR<MatrixType> qr; + ColPivHouseholderQR<MatrixType> qr; VERIFY_RAISES_ASSERT(qr.matrixQR()) VERIFY_RAISES_ASSERT(qr.solve(tmp,&tmp)) VERIFY_RAISES_ASSERT(qr.matrixQ()) @@ -155,24 +155,24 @@ template<typename MatrixType> void qr_verify_assert() void test_qr_colpivoting() { for(int i = 0; i < 1; i++) { - CALL_SUBTEST( qr<MatrixXf>() ); - CALL_SUBTEST( qr<MatrixXd>() ); - CALL_SUBTEST( qr<MatrixXcd>() ); - CALL_SUBTEST(( qr_fixedsize<Matrix<float,3,5>, 4 >() )); - CALL_SUBTEST(( qr_fixedsize<Matrix<double,6,2>, 3 >() )); + CALL_SUBTEST_1( qr<MatrixXf>() ); + CALL_SUBTEST_2( qr<MatrixXd>() ); + CALL_SUBTEST_3( qr<MatrixXcd>() ); + CALL_SUBTEST_4(( qr_fixedsize<Matrix<float,3,5>, 4 >() )); + CALL_SUBTEST_5(( qr_fixedsize<Matrix<double,6,2>, 3 >() )); } for(int i = 0; i < g_repeat; i++) { - CALL_SUBTEST( qr_invertible<MatrixXf>() ); - CALL_SUBTEST( qr_invertible<MatrixXd>() ); - CALL_SUBTEST( qr_invertible<MatrixXcf>() ); - CALL_SUBTEST( qr_invertible<MatrixXcd>() ); + CALL_SUBTEST_1( qr_invertible<MatrixXf>() ); + CALL_SUBTEST_2( qr_invertible<MatrixXd>() ); + CALL_SUBTEST_6( qr_invertible<MatrixXcf>() ); + CALL_SUBTEST_3( qr_invertible<MatrixXcd>() ); } - CALL_SUBTEST(qr_verify_assert<Matrix3f>()); - CALL_SUBTEST(qr_verify_assert<Matrix3d>()); - CALL_SUBTEST(qr_verify_assert<MatrixXf>()); - CALL_SUBTEST(qr_verify_assert<MatrixXd>()); - CALL_SUBTEST(qr_verify_assert<MatrixXcf>()); - CALL_SUBTEST(qr_verify_assert<MatrixXcd>()); + CALL_SUBTEST_7(qr_verify_assert<Matrix3f>()); + CALL_SUBTEST_8(qr_verify_assert<Matrix3d>()); + CALL_SUBTEST_1(qr_verify_assert<MatrixXf>()); + CALL_SUBTEST_2(qr_verify_assert<MatrixXd>()); + CALL_SUBTEST_6(qr_verify_assert<MatrixXcf>()); + CALL_SUBTEST_3(qr_verify_assert<MatrixXcd>()); } |