GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-01 17:50:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

test/triangular.cpp: isUpper() --> isUpperTriangular()

Browse Source 
Necessary to get the test to compile after c5d7c9f0def693e77797e6e43cb1fd2e7f8ae2fd
.
I'm assuming that isUpperTriangular() is the name we want; the alternative
is to change Eigen/src/Core/{MatrixBase,TriangularMatrix}.h
This commit is contained in:
Jitse Niesen 2010-01-08 12:46:24 +00:00
parent 0fb0307377
commit ef0ed5b271
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Eigen/src/Core/TriangularMatrix.h
View File

@ -627,7 +627,7 @@ const TriangularView<Derived, Mode> MatrixBase<Derived>::triangularView() const
/** \returns true if *this is approximately equal to an upper triangular matrix, /** \returns true if *this is approximately equal to an upper triangular matrix,
* within the precision given by \a prec. * within the precision given by \a prec.
* *
* \sa isLower(), extract(), part(), marked() * \sa isLowerTriangular(), extract(), part(), marked()
*/ */
template<typename Derived> template<typename Derived>
bool MatrixBase<Derived>::isUpperTriangular(RealScalar prec) const 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, /** \returns true if *this is approximately equal to a lower triangular matrix,
* within the precision given by \a prec. * within the precision given by \a prec.
* *
* \sa isUpper(), extract(), part(), marked() * \sa isUpperTriangular(), extract(), part(), marked()
*/ */
template<typename Derived> template<typename Derived>
bool MatrixBase<Derived>::isLowerTriangular(RealScalar prec) const bool MatrixBase<Derived>::isLowerTriangular(RealScalar prec) const

30
test/triangular.cpp
View File

@ -58,9 +58,9 @@ template<typename MatrixType> void triangular_square(const MatrixType& m)
if (rows*cols>1) if (rows*cols>1)
{ {
VERIFY(m1up.isUpper()); VERIFY(m1up.isUpperTriangular());
VERIFY(m2up.transpose().isLower()); VERIFY(m2up.transpose().isLowerTriangular());
VERIFY(!m2.isLower()); VERIFY(!m2.isLowerTriangular());
} }
// VERIFY_IS_APPROX(m1up.transpose() * m2, m1.upper().transpose().lower() * m2); // 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(m2.isApprox(m3 * (m1.template triangularView<UnitUpper>().solve(m2)), largerEps));
// VERIFY(( m1.template triangularView<Upper>() // VERIFY(( m1.template triangularView<Upper>()
// * m2.template triangularView<Upper>()).isUpper()); // * m2.template triangularView<Upper>()).isUpperTriangular());
// test swap // test swap
m1.setOnes(); m1.setOnes();
@ -170,9 +170,9 @@ template<typename MatrixType> void triangular_rect(const MatrixType& m)
if (rows*cols>1) if (rows*cols>1)
{ {
VERIFY(m1up.isUpper()); VERIFY(m1up.isUpperTriangular());
VERIFY(m2up.transpose().isLower()); VERIFY(m2up.transpose().isLowerTriangular());
VERIFY(!m2.isLower()); VERIFY(!m2.isLowerTriangular());
} }
// test overloaded operator+= // 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); VERIFY_IS_APPROX(m3.template triangularView<StrictlyLower>().toDenseMatrix(), m1);
m1.setRandom(); m1.setRandom();
m2 = m1.template triangularView<Upper>(); m2 = m1.template triangularView<Upper>();
VERIFY(m2.isUpper()); VERIFY(m2.isUpperTriangular());
VERIFY(!m2.isLower()); VERIFY(!m2.isLowerTriangular());
m2 = m1.template triangularView<StrictlyUpper>(); m2 = m1.template triangularView<StrictlyUpper>();
VERIFY(m2.isUpper()); VERIFY(m2.isUpperTriangular());
VERIFY(m2.diagonal().isMuchSmallerThan(RealScalar(1))); VERIFY(m2.diagonal().isMuchSmallerThan(RealScalar(1)));
m2 = m1.template triangularView<UnitUpper>(); m2 = m1.template triangularView<UnitUpper>();
VERIFY(m2.isUpper()); VERIFY(m2.isUpperTriangular());
m2.diagonal().array() -= Scalar(1); m2.diagonal().array() -= Scalar(1);
VERIFY(m2.diagonal().isMuchSmallerThan(RealScalar(1))); VERIFY(m2.diagonal().isMuchSmallerThan(RealScalar(1)));
m2 = m1.template triangularView<Lower>(); m2 = m1.template triangularView<Lower>();
VERIFY(m2.isLower()); VERIFY(m2.isLowerTriangular());
VERIFY(!m2.isUpper()); VERIFY(!m2.isUpperTriangular());
m2 = m1.template triangularView<StrictlyLower>(); m2 = m1.template triangularView<StrictlyLower>();
VERIFY(m2.isLower()); VERIFY(m2.isLowerTriangular());
VERIFY(m2.diagonal().isMuchSmallerThan(RealScalar(1))); VERIFY(m2.diagonal().isMuchSmallerThan(RealScalar(1)));
m2 = m1.template triangularView<UnitLower>(); m2 = m1.template triangularView<UnitLower>();
VERIFY(m2.isLower()); VERIFY(m2.isLowerTriangular());
m2.diagonal().array() -= Scalar(1); m2.diagonal().array() -= Scalar(1);
VERIFY(m2.diagonal().isMuchSmallerThan(RealScalar(1))); VERIFY(m2.diagonal().isMuchSmallerThan(RealScalar(1)));
// test swap // test swap