diff options
Diffstat (limited to 'test/qr_fullpivoting.cpp')
| -rw-r--r-- | test/qr_fullpivoting.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/test/qr_fullpivoting.cpp b/test/qr_fullpivoting.cpp index 891c2a527..38ee4eac1 100644 --- a/test/qr_fullpivoting.cpp +++ b/test/qr_fullpivoting.cpp @@ -36,7 +36,7 @@ template<typename MatrixType> void qr() typedef Matrix<Scalar, MatrixType::ColsAtCompileTime, 1> VectorType; MatrixType m1; createRandomMatrixOfRank(rank,rows,cols,m1); - FullPivotingHouseholderQR<MatrixType> qr(m1); + FullPivHouseholderQR<MatrixType> qr(m1); VERIFY_IS_APPROX(rank, qr.rank()); VERIFY(cols - qr.rank() == qr.dimensionOfKernel()); VERIFY(!qr.isInjective()); @@ -84,7 +84,7 @@ template<typename MatrixType> void qr_invertible() m1 += a * a.adjoint(); } - FullPivotingHouseholderQR<MatrixType> qr(m1); + FullPivHouseholderQR<MatrixType> qr(m1); VERIFY(qr.isInjective()); VERIFY(qr.isInvertible()); VERIFY(qr.isSurjective()); @@ -108,7 +108,7 @@ template<typename MatrixType> void qr_verify_assert() { MatrixType tmp; - FullPivotingHouseholderQR<MatrixType> qr; + FullPivHouseholderQR<MatrixType> qr; VERIFY_RAISES_ASSERT(qr.matrixQR()) VERIFY_RAISES_ASSERT(qr.solve(tmp,&tmp)) VERIFY_RAISES_ASSERT(qr.matrixQ()) @@ -126,23 +126,23 @@ void test_qr_fullpivoting() { for(int i = 0; i < 1; i++) { // FIXME : very weird bug here -// CALL_SUBTEST( qr(Matrix2f()) ); - CALL_SUBTEST( qr<MatrixXf>() ); - CALL_SUBTEST( qr<MatrixXd>() ); - CALL_SUBTEST( qr<MatrixXcd>() ); +// CALL_SUBTEST(qr(Matrix2f()) ); + CALL_SUBTEST_1( qr<MatrixXf>() ); + CALL_SUBTEST_2( qr<MatrixXd>() ); + CALL_SUBTEST_3( qr<MatrixXcd>() ); } 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_4( 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_5(qr_verify_assert<Matrix3f>()); + CALL_SUBTEST_6(qr_verify_assert<Matrix3d>()); + CALL_SUBTEST_1(qr_verify_assert<MatrixXf>()); + CALL_SUBTEST_2(qr_verify_assert<MatrixXd>()); + CALL_SUBTEST_4(qr_verify_assert<MatrixXcf>()); + CALL_SUBTEST_3(qr_verify_assert<MatrixXcd>()); } |