diff options
| -rw-r--r-- | Eigen/src/Core/TriangularMatrix.h | 4 | ||||
| -rw-r--r-- | test/triangular.cpp | 30 |
2 files changed, 17 insertions, 17 deletions
diff --git a/Eigen/src/Core/TriangularMatrix.h b/Eigen/src/Core/TriangularMatrix.h index 8411b0546..e51be366b 100644 --- a/Eigen/src/Core/TriangularMatrix.h +++ b/Eigen/src/Core/TriangularMatrix.h @@ -627,7 +627,7 @@ const TriangularView<Derived, Mode> MatrixBase<Derived>::triangularView() const /** \returns true if *this is approximately equal to an upper triangular matrix, * within the precision given by \a prec. * - * \sa isLower(), extract(), part(), marked() + * \sa isLowerTriangular(), extract(), part(), marked() */ template<typename Derived> bool MatrixBase<Derived>::isUpperTriangular(RealScalar prec) const @@ -652,7 +652,7 @@ bool MatrixBase<Derived>::isUpperTriangular(RealScalar prec) const /** \returns true if *this is approximately equal to a lower triangular matrix, * within the precision given by \a prec. * - * \sa isUpper(), extract(), part(), marked() + * \sa isUpperTriangular(), extract(), part(), marked() */ template<typename Derived> bool MatrixBase<Derived>::isLowerTriangular(RealScalar prec) const diff --git a/test/triangular.cpp b/test/triangular.cpp index 2903e247c..d6d64e595 100644 --- a/test/triangular.cpp +++ b/test/triangular.cpp @@ -58,9 +58,9 @@ template<typename MatrixType> void triangular_square(const MatrixType& m) if (rows*cols>1) { - VERIFY(m1up.isUpper()); - VERIFY(m2up.transpose().isLower()); - VERIFY(!m2.isLower()); + VERIFY(m1up.isUpperTriangular()); + VERIFY(m2up.transpose().isLowerTriangular()); + VERIFY(!m2.isLowerTriangular()); } // VERIFY_IS_APPROX(m1up.transpose() * m2, m1.upper().transpose().lower() * m2); @@ -124,7 +124,7 @@ template<typename MatrixType> void triangular_square(const MatrixType& m) VERIFY(m2.isApprox(m3 * (m1.template triangularView<UnitUpper>().solve(m2)), largerEps)); // VERIFY(( m1.template triangularView<Upper>() -// * m2.template triangularView<Upper>()).isUpper()); +// * m2.template triangularView<Upper>()).isUpperTriangular()); // test swap m1.setOnes(); @@ -170,9 +170,9 @@ template<typename MatrixType> void triangular_rect(const MatrixType& m) if (rows*cols>1) { - VERIFY(m1up.isUpper()); - VERIFY(m2up.transpose().isLower()); - VERIFY(!m2.isLower()); + VERIFY(m1up.isUpperTriangular()); + VERIFY(m2up.transpose().isLowerTriangular()); + VERIFY(!m2.isLowerTriangular()); } // test overloaded operator+= @@ -203,23 +203,23 @@ template<typename MatrixType> void triangular_rect(const MatrixType& m) VERIFY_IS_APPROX(m3.template triangularView<StrictlyLower>().toDenseMatrix(), m1); m1.setRandom(); m2 = m1.template triangularView<Upper>(); - VERIFY(m2.isUpper()); - VERIFY(!m2.isLower()); + VERIFY(m2.isUpperTriangular()); + VERIFY(!m2.isLowerTriangular()); m2 = m1.template triangularView<StrictlyUpper>(); - VERIFY(m2.isUpper()); + VERIFY(m2.isUpperTriangular()); VERIFY(m2.diagonal().isMuchSmallerThan(RealScalar(1))); m2 = m1.template triangularView<UnitUpper>(); - VERIFY(m2.isUpper()); + VERIFY(m2.isUpperTriangular()); m2.diagonal().array() -= Scalar(1); VERIFY(m2.diagonal().isMuchSmallerThan(RealScalar(1))); m2 = m1.template triangularView<Lower>(); - VERIFY(m2.isLower()); - VERIFY(!m2.isUpper()); + VERIFY(m2.isLowerTriangular()); + VERIFY(!m2.isUpperTriangular()); m2 = m1.template triangularView<StrictlyLower>(); - VERIFY(m2.isLower()); + VERIFY(m2.isLowerTriangular()); VERIFY(m2.diagonal().isMuchSmallerThan(RealScalar(1))); m2 = m1.template triangularView<UnitLower>(); - VERIFY(m2.isLower()); + VERIFY(m2.isLowerTriangular()); m2.diagonal().array() -= Scalar(1); VERIFY(m2.diagonal().isMuchSmallerThan(RealScalar(1))); // test swap |