devtools/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2026-04-10 11:34:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove the Triangular suffix to Upper, Lower, UnitLower, etc,

Browse Source 
and remove the respective bit flags
This commit is contained in:
Gael Guennebaud
2010-01-07 21:15:32 +01:00
parent 82ec250a0f
commit c5d7c9f0de
58 changed files with 591 additions and 563 deletions
Download Patch File Download Diff File Expand all files Collapse all files

130
test/triangular.cpp
View File

@@ -53,14 +53,14 @@ template<typename MatrixType> void triangular_square(const MatrixType& m)
v2 = VectorType::Random(rows),
vzero = VectorType::Zero(rows);
MatrixType m1up = m1.template triangularView<UpperTriangular>();
MatrixType m2up = m2.template triangularView<UpperTriangular>();
MatrixType m1up = m1.template triangularView<Upper>();
MatrixType m2up = m2.template triangularView<Upper>();
if (rows*cols>1)
{
VERIFY(m1up.isUpperTriangular());
VERIFY(m2up.transpose().isLowerTriangular());
VERIFY(!m2.isLowerTriangular());
VERIFY(m1up.isUpper());
VERIFY(m2up.transpose().isLower());
VERIFY(!m2.isLower());
}
// VERIFY_IS_APPROX(m1up.transpose() * m2, m1.upper().transpose().lower() * m2);
@@ -68,20 +68,20 @@ template<typename MatrixType> void triangular_square(const MatrixType& m)
// test overloaded operator+=
r1.setZero();
r2.setZero();
r1.template triangularView<UpperTriangular>() += m1;
r1.template triangularView<Upper>() += m1;
r2 += m1up;
VERIFY_IS_APPROX(r1,r2);
// test overloaded operator=
m1.setZero();
m1.template triangularView<UpperTriangular>() = m2.transpose() + m2;
m1.template triangularView<Upper>() = m2.transpose() + m2;
m3 = m2.transpose() + m2;
VERIFY_IS_APPROX(m3.template triangularView<LowerTriangular>().transpose().toDenseMatrix(), m1);
VERIFY_IS_APPROX(m3.template triangularView<Lower>().transpose().toDenseMatrix(), m1);
// test overloaded operator=
m1.setZero();
m1.template triangularView<LowerTriangular>() = m2.transpose() + m2;
VERIFY_IS_APPROX(m3.template triangularView<LowerTriangular>().toDenseMatrix(), m1);
m1.template triangularView<Lower>() = m2.transpose() + m2;
VERIFY_IS_APPROX(m3.template triangularView<Lower>().toDenseMatrix(), m1);
m1 = MatrixType::Random(rows, cols);
for (int i=0; i<rows; ++i)
@@ -89,49 +89,49 @@ template<typename MatrixType> void triangular_square(const MatrixType& m)
Transpose<MatrixType> trm4(m4);
// test back and forward subsitution with a vector as the rhs
m3 = m1.template triangularView<UpperTriangular>();
VERIFY(v2.isApprox(m3.adjoint() * (m1.adjoint().template triangularView<LowerTriangular>().solve(v2)), largerEps));
m3 = m1.template triangularView<LowerTriangular>();
VERIFY(v2.isApprox(m3.transpose() * (m1.transpose().template triangularView<UpperTriangular>().solve(v2)), largerEps));
m3 = m1.template triangularView<UpperTriangular>();
VERIFY(v2.isApprox(m3 * (m1.template triangularView<UpperTriangular>().solve(v2)), largerEps));
m3 = m1.template triangularView<LowerTriangular>();
VERIFY(v2.isApprox(m3.conjugate() * (m1.conjugate().template triangularView<LowerTriangular>().solve(v2)), largerEps));
m3 = m1.template triangularView<Upper>();
VERIFY(v2.isApprox(m3.adjoint() * (m1.adjoint().template triangularView<Lower>().solve(v2)), largerEps));
m3 = m1.template triangularView<Lower>();
VERIFY(v2.isApprox(m3.transpose() * (m1.transpose().template triangularView<Upper>().solve(v2)), largerEps));
m3 = m1.template triangularView<Upper>();
VERIFY(v2.isApprox(m3 * (m1.template triangularView<Upper>().solve(v2)), largerEps));
m3 = m1.template triangularView<Lower>();
VERIFY(v2.isApprox(m3.conjugate() * (m1.conjugate().template triangularView<Lower>().solve(v2)), largerEps));
// test back and forward subsitution with a matrix as the rhs
m3 = m1.template triangularView<UpperTriangular>();
VERIFY(m2.isApprox(m3.adjoint() * (m1.adjoint().template triangularView<LowerTriangular>().solve(m2)), largerEps));
m3 = m1.template triangularView<LowerTriangular>();
VERIFY(m2.isApprox(m3.transpose() * (m1.transpose().template triangularView<UpperTriangular>().solve(m2)), largerEps));
m3 = m1.template triangularView<UpperTriangular>();
VERIFY(m2.isApprox(m3 * (m1.template triangularView<UpperTriangular>().solve(m2)), largerEps));
m3 = m1.template triangularView<LowerTriangular>();
VERIFY(m2.isApprox(m3.conjugate() * (m1.conjugate().template triangularView<LowerTriangular>().solve(m2)), largerEps));
m3 = m1.template triangularView<Upper>();
VERIFY(m2.isApprox(m3.adjoint() * (m1.adjoint().template triangularView<Lower>().solve(m2)), largerEps));
m3 = m1.template triangularView<Lower>();
VERIFY(m2.isApprox(m3.transpose() * (m1.transpose().template triangularView<Upper>().solve(m2)), largerEps));
m3 = m1.template triangularView<Upper>();
VERIFY(m2.isApprox(m3 * (m1.template triangularView<Upper>().solve(m2)), largerEps));
m3 = m1.template triangularView<Lower>();
VERIFY(m2.isApprox(m3.conjugate() * (m1.conjugate().template triangularView<Lower>().solve(m2)), largerEps));
// check M * inv(L) using in place API
m4 = m3;
m3.transpose().template triangularView<Eigen::UpperTriangular>().solveInPlace(trm4);
m3.transpose().template triangularView<Eigen::Upper>().solveInPlace(trm4);
VERIFY(m4.cwiseAbs().isIdentity(test_precision<RealScalar>()));
// check M * inv(U) using in place API
m3 = m1.template triangularView<UpperTriangular>();
m3 = m1.template triangularView<Upper>();
m4 = m3;
m3.transpose().template triangularView<Eigen::LowerTriangular>().solveInPlace(trm4);
m3.transpose().template triangularView<Eigen::Lower>().solveInPlace(trm4);
VERIFY(m4.cwiseAbs().isIdentity(test_precision<RealScalar>()));
// check solve with unit diagonal
m3 = m1.template triangularView<UnitUpperTriangular>();
VERIFY(m2.isApprox(m3 * (m1.template triangularView<UnitUpperTriangular>().solve(m2)), largerEps));
m3 = m1.template triangularView<UnitUpper>();
VERIFY(m2.isApprox(m3 * (m1.template triangularView<UnitUpper>().solve(m2)), largerEps));
// VERIFY(( m1.template triangularView<UpperTriangular>()
// * m2.template triangularView<UpperTriangular>()).isUpperTriangular());
// VERIFY(( m1.template triangularView<Upper>()
// * m2.template triangularView<Upper>()).isUpper());
// test swap
m1.setOnes();
m2.setZero();
m2.template triangularView<UpperTriangular>().swap(m1);
m2.template triangularView<Upper>().swap(m1);
m3.setZero();
m3.template triangularView<UpperTriangular>().setOnes();
m3.template triangularView<Upper>().setOnes();
VERIFY_IS_APPROX(m2,m3);
}
@@ -165,69 +165,69 @@ template<typename MatrixType> void triangular_rect(const MatrixType& m)
v2 = VectorType::Random(rows),
vzero = VectorType::Zero(rows);
MatrixType m1up = m1.template triangularView<UpperTriangular>();
MatrixType m2up = m2.template triangularView<UpperTriangular>();
MatrixType m1up = m1.template triangularView<Upper>();
MatrixType m2up = m2.template triangularView<Upper>();
if (rows*cols>1)
{
VERIFY(m1up.isUpperTriangular());
VERIFY(m2up.transpose().isLowerTriangular());
VERIFY(!m2.isLowerTriangular());
VERIFY(m1up.isUpper());
VERIFY(m2up.transpose().isLower());
VERIFY(!m2.isLower());
}
// test overloaded operator+=
r1.setZero();
r2.setZero();
r1.template triangularView<UpperTriangular>() += m1;
r1.template triangularView<Upper>() += m1;
r2 += m1up;
VERIFY_IS_APPROX(r1,r2);
// test overloaded operator=
m1.setZero();
m1.template triangularView<UpperTriangular>() = 3 * m2;
m1.template triangularView<Upper>() = 3 * m2;
m3 = 3 * m2;
VERIFY_IS_APPROX(m3.template triangularView<UpperTriangular>().toDenseMatrix(), m1);
VERIFY_IS_APPROX(m3.template triangularView<Upper>().toDenseMatrix(), m1);
m1.setZero();
m1.template triangularView<LowerTriangular>() = 3 * m2;
VERIFY_IS_APPROX(m3.template triangularView<LowerTriangular>().toDenseMatrix(), m1);
m1.template triangularView<Lower>() = 3 * m2;
VERIFY_IS_APPROX(m3.template triangularView<Lower>().toDenseMatrix(), m1);
m1.setZero();
m1.template triangularView<StrictlyUpperTriangular>() = 3 * m2;
VERIFY_IS_APPROX(m3.template triangularView<StrictlyUpperTriangular>().toDenseMatrix(), m1);
m1.template triangularView<StrictlyUpper>() = 3 * m2;
VERIFY_IS_APPROX(m3.template triangularView<StrictlyUpper>().toDenseMatrix(), m1);
m1.setZero();
m1.template triangularView<StrictlyLowerTriangular>() = 3 * m2;
VERIFY_IS_APPROX(m3.template triangularView<StrictlyLowerTriangular>().toDenseMatrix(), m1);
m1.template triangularView<StrictlyLower>() = 3 * m2;
VERIFY_IS_APPROX(m3.template triangularView<StrictlyLower>().toDenseMatrix(), m1);
m1.setRandom();
m2 = m1.template triangularView<UpperTriangular>();
VERIFY(m2.isUpperTriangular());
VERIFY(!m2.isLowerTriangular());
m2 = m1.template triangularView<StrictlyUpperTriangular>();
VERIFY(m2.isUpperTriangular());
m2 = m1.template triangularView<Upper>();
VERIFY(m2.isUpper());
VERIFY(!m2.isLower());
m2 = m1.template triangularView<StrictlyUpper>();
VERIFY(m2.isUpper());
VERIFY(m2.diagonal().isMuchSmallerThan(RealScalar(1)));
m2 = m1.template triangularView<UnitUpperTriangular>();
VERIFY(m2.isUpperTriangular());
m2 = m1.template triangularView<UnitUpper>();
VERIFY(m2.isUpper());
m2.diagonal().array() -= Scalar(1);
VERIFY(m2.diagonal().isMuchSmallerThan(RealScalar(1)));
m2 = m1.template triangularView<LowerTriangular>();
VERIFY(m2.isLowerTriangular());
VERIFY(!m2.isUpperTriangular());
m2 = m1.template triangularView<StrictlyLowerTriangular>();
VERIFY(m2.isLowerTriangular());
m2 = m1.template triangularView<Lower>();
VERIFY(m2.isLower());
VERIFY(!m2.isUpper());
m2 = m1.template triangularView<StrictlyLower>();
VERIFY(m2.isLower());
VERIFY(m2.diagonal().isMuchSmallerThan(RealScalar(1)));
m2 = m1.template triangularView<UnitLowerTriangular>();
VERIFY(m2.isLowerTriangular());
m2 = m1.template triangularView<UnitLower>();
VERIFY(m2.isLower());
m2.diagonal().array() -= Scalar(1);
VERIFY(m2.diagonal().isMuchSmallerThan(RealScalar(1)));
// test swap
m1.setOnes();
m2.setZero();
m2.template triangularView<UpperTriangular>().swap(m1);
m2.template triangularView<Upper>().swap(m1);
m3.setZero();
m3.template triangularView<UpperTriangular>().setOnes();
m3.template triangularView<Upper>().setOnes();
VERIFY_IS_APPROX(m2,m3);
}