diff options
author | Benoit Jacob <jacob.benoit.1@gmail.com> | 2009-12-02 11:11:09 -0500 |
---|---|---|
committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2009-12-02 11:11:09 -0500 |
commit | 3e73f6036c4f28ae8d11ae43641c213e608529e6 (patch) | |
tree | f9287eac5106ed6618f7b58b4dc8ab311b186bb2 /test/qr_colpivoting.cpp | |
parent | 3279e3934013d28b3870dd861eb64aec241a38b7 (diff) |
* HouseholderSequence:
* be aware of number of actual householder vectors
(optimization in non-full-rank case, no behavior change)
* fix applyThisOnTheRight, it was using k instead of actual_k
* QR: rename matrixQ() to householderQ() where applicable
Diffstat (limited to 'test/qr_colpivoting.cpp')
-rw-r--r-- | test/qr_colpivoting.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/qr_colpivoting.cpp b/test/qr_colpivoting.cpp index 48b6de3f5..8b56cd296 100644 --- a/test/qr_colpivoting.cpp +++ b/test/qr_colpivoting.cpp @@ -44,7 +44,7 @@ template<typename MatrixType> void qr() VERIFY(!qr.isInvertible()); VERIFY(!qr.isSurjective()); - MatrixQType q = qr.matrixQ(); + MatrixQType q = qr.householderQ(); VERIFY_IS_UNITARY(q); MatrixType r = qr.matrixQR().template triangularView<UpperTriangular>(); @@ -73,7 +73,7 @@ template<typename MatrixType, int Cols2> void qr_fixedsize() VERIFY(!qr.isSurjective()); Matrix<Scalar,Rows,Cols> r = qr.matrixQR().template triangularView<UpperTriangular>(); - Matrix<Scalar,Rows,Cols> c = qr.matrixQ() * r * qr.colsPermutation().inverse(); + Matrix<Scalar,Rows,Cols> c = qr.householderQ() * r * qr.colsPermutation().inverse(); VERIFY_IS_APPROX(m1, c); Matrix<Scalar,Cols,Cols2> m2 = Matrix<Scalar,Cols,Cols2>::Random(Cols,Cols2); @@ -109,7 +109,7 @@ template<typename MatrixType> void qr_invertible() m1.setZero(); for(int i = 0; i < size; i++) m1(i,i) = ei_random<Scalar>(); RealScalar absdet = ei_abs(m1.diagonal().prod()); - m3 = qr.matrixQ(); // get a unitary + m3 = qr.householderQ(); // get a unitary m1 = m3 * m1 * m3; qr.compute(m1); VERIFY_IS_APPROX(absdet, qr.absDeterminant()); @@ -123,7 +123,7 @@ template<typename MatrixType> void qr_verify_assert() ColPivHouseholderQR<MatrixType> qr; VERIFY_RAISES_ASSERT(qr.matrixQR()) VERIFY_RAISES_ASSERT(qr.solve(tmp)) - VERIFY_RAISES_ASSERT(qr.matrixQ()) + VERIFY_RAISES_ASSERT(qr.householderQ()) VERIFY_RAISES_ASSERT(qr.dimensionOfKernel()) VERIFY_RAISES_ASSERT(qr.isInjective()) VERIFY_RAISES_ASSERT(qr.isSurjective()) |