diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/geo_hyperplane.cpp | 2 | ||||
-rw-r--r-- | test/main.h | 2 | ||||
-rw-r--r-- | test/qr.cpp | 10 | ||||
-rw-r--r-- | test/qr_colpivoting.cpp | 8 |
4 files changed, 11 insertions, 11 deletions
diff --git a/test/geo_hyperplane.cpp b/test/geo_hyperplane.cpp index 3cf5655c2..1fd1e281a 100644 --- a/test/geo_hyperplane.cpp +++ b/test/geo_hyperplane.cpp @@ -64,7 +64,7 @@ template<typename HyperplaneType> void hyperplane(const HyperplaneType& _plane) // transform if (!NumTraits<Scalar>::IsComplex) { - MatrixType rot = MatrixType::Random(dim,dim).householderQr().matrixQ(); + MatrixType rot = MatrixType::Random(dim,dim).householderQr().householderQ(); DiagonalMatrix<Scalar,HyperplaneType::AmbientDimAtCompileTime> scaling(VectorType::Random()); Translation<Scalar,HyperplaneType::AmbientDimAtCompileTime> translation(VectorType::Random()); diff --git a/test/main.h b/test/main.h index 3fded75c8..9624838ff 100644 --- a/test/main.h +++ b/test/main.h @@ -360,7 +360,7 @@ void createRandomMatrixOfRank(int desired_rank, int rows, int cols, MatrixType& HouseholderQR<MatrixAType> qra(a); HouseholderQR<MatrixBType> qrb(b); - m = qra.matrixQ() * d * qrb.matrixQ(); + m = qra.householderQ() * d * qrb.householderQ(); } } // end namespace Eigen diff --git a/test/qr.cpp b/test/qr.cpp index 90b5c4446..3848ce0a5 100644 --- a/test/qr.cpp +++ b/test/qr.cpp @@ -38,13 +38,13 @@ template<typename MatrixType> void qr(const MatrixType& m) HouseholderQR<MatrixType> qrOfA(a); MatrixType r = qrOfA.matrixQR(); - MatrixQType q = qrOfA.matrixQ(); + MatrixQType q = qrOfA.householderQ(); VERIFY_IS_UNITARY(q); // FIXME need better way to construct trapezoid for(int i = 0; i < rows; i++) for(int j = 0; j < cols; j++) if(i>j) r(i,j) = Scalar(0); - VERIFY_IS_APPROX(a, qrOfA.matrixQ() * r); + VERIFY_IS_APPROX(a, qrOfA.householderQ() * r); } template<typename MatrixType, int Cols2> void qr_fixedsize() @@ -58,7 +58,7 @@ template<typename MatrixType, int Cols2> void qr_fixedsize() // FIXME need better way to construct trapezoid for(int i = 0; i < Rows; i++) for(int j = 0; j < Cols; j++) if(i>j) r(i,j) = Scalar(0); - VERIFY_IS_APPROX(m1, qr.matrixQ() * r); + VERIFY_IS_APPROX(m1, qr.householderQ() * r); Matrix<Scalar,Cols,Cols2> m2 = Matrix<Scalar,Cols,Cols2>::Random(Cols,Cols2); Matrix<Scalar,Rows,Cols2> m3 = m1*m2; @@ -93,7 +93,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()); @@ -107,7 +107,7 @@ template<typename MatrixType> void qr_verify_assert() HouseholderQR<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.absDeterminant()) VERIFY_RAISES_ASSERT(qr.logAbsDeterminant()) } 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()) |