Compare commits
1 Commits
fc61442b68
...
75edad3d0a
| Author | SHA1 | Date | |
|---|---|---|---|
| 75edad3d0a |
@@ -423,48 +423,48 @@ TEST_CASE("Euclidean Norm", "Matrix") {
|
|||||||
}
|
}
|
||||||
|
|
||||||
TEST_CASE("QR Decompositions", "Matrix") {
|
TEST_CASE("QR Decompositions", "Matrix") {
|
||||||
// SECTION("2x2 QRDecomposition") {
|
SECTION("2x2 QRDecomposition") {
|
||||||
// Matrix<2, 2> A{1.0f, 2.0f, 3.0f, 4.0f};
|
Matrix<2, 2> A{1.0f, 2.0f, 3.0f, 4.0f};
|
||||||
// Matrix<2, 2> Q{}, R{};
|
Matrix<2, 2> Q{}, R{};
|
||||||
// A.QRDecomposition(Q, R);
|
A.QRDecomposition(Q, R);
|
||||||
|
|
||||||
// // Check that Q * R ≈ A
|
// Check that Q * R ≈ A
|
||||||
// Matrix<2, 2> QR{};
|
Matrix<2, 2> QR{};
|
||||||
// Q.Mult(R, QR);
|
Q.Mult(R, QR);
|
||||||
// for (int i = 0; i < 2; ++i) {
|
for (int i = 0; i < 2; ++i) {
|
||||||
// for (int j = 0; j < 2; ++j) {
|
for (int j = 0; j < 2; ++j) {
|
||||||
// REQUIRE_THAT(QR[i][j], Catch::Matchers::WithinRel(A[i][j], 1e-4f));
|
REQUIRE_THAT(QR[i][j], Catch::Matchers::WithinRel(A[i][j], 1e-4f));
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
|
|
||||||
// // Check that Q is orthonormal: Qᵀ * Q ≈ I
|
// Check that Q is orthonormal: Qᵀ * Q ≈ I
|
||||||
// Matrix<2, 2> Qt = Q.Transpose();
|
Matrix<2, 2> Qt = Q.Transpose();
|
||||||
// Matrix<2, 2> QtQ{};
|
Matrix<2, 2> QtQ{};
|
||||||
// Qt.Mult(Q, QtQ);
|
Qt.Mult(Q, QtQ);
|
||||||
// for (int i = 0; i < 2; ++i) {
|
for (int i = 0; i < 2; ++i) {
|
||||||
// for (int j = 0; j < 2; ++j) {
|
for (int j = 0; j < 2; ++j) {
|
||||||
// if (i == j)
|
if (i == j)
|
||||||
// REQUIRE_THAT(QtQ[i][j], Catch::Matchers::WithinRel(1.0f, 1e-4f));
|
REQUIRE_THAT(QtQ[i][j], Catch::Matchers::WithinRel(1.0f, 1e-4f));
|
||||||
// else
|
else
|
||||||
// REQUIRE_THAT(QtQ[i][j], Catch::Matchers::WithinAbs(0.0f, 1e-4f));
|
REQUIRE_THAT(QtQ[i][j], Catch::Matchers::WithinAbs(0.0f, 1e-4f));
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
|
|
||||||
// // Optional: R should be upper triangular
|
// Optional: R should be upper triangular
|
||||||
// REQUIRE(std::fabs(R[1][0]) < 1e-4f);
|
REQUIRE(std::fabs(R[1][0]) < 1e-4f);
|
||||||
|
|
||||||
// // check that all Q values are correct
|
// check that all Q values are correct
|
||||||
// REQUIRE_THAT(Q[0][0], Catch::Matchers::WithinRel(0.3162f, 1e-4f));
|
REQUIRE_THAT(Q[0][0], Catch::Matchers::WithinRel(0.3162f, 1e-4f));
|
||||||
// REQUIRE_THAT(Q[0][1], Catch::Matchers::WithinRel(0.94868f, 1e-4f));
|
REQUIRE_THAT(Q[0][1], Catch::Matchers::WithinRel(0.94868f, 1e-4f));
|
||||||
// REQUIRE_THAT(Q[1][0], Catch::Matchers::WithinRel(0.94868f, 1e-4f));
|
REQUIRE_THAT(Q[1][0], Catch::Matchers::WithinRel(0.94868f, 1e-4f));
|
||||||
// REQUIRE_THAT(Q[1][1], Catch::Matchers::WithinRel(-0.3162f, 1e-4f));
|
REQUIRE_THAT(Q[1][1], Catch::Matchers::WithinRel(-0.3162f, 1e-4f));
|
||||||
|
|
||||||
// // check that all R values are correct
|
// check that all R values are correct
|
||||||
// REQUIRE_THAT(R[0][0], Catch::Matchers::WithinRel(3.16228f, 1e-4f));
|
REQUIRE_THAT(R[0][0], Catch::Matchers::WithinRel(3.16228f, 1e-4f));
|
||||||
// REQUIRE_THAT(R[0][1], Catch::Matchers::WithinRel(4.42719f, 1e-4f));
|
REQUIRE_THAT(R[0][1], Catch::Matchers::WithinRel(4.42719f, 1e-4f));
|
||||||
// REQUIRE_THAT(R[1][0], Catch::Matchers::WithinRel(0.0f, 1e-4f));
|
REQUIRE_THAT(R[1][0], Catch::Matchers::WithinRel(0.0f, 1e-4f));
|
||||||
// REQUIRE_THAT(R[1][1], Catch::Matchers::WithinRel(0.63246f, 1e-4f));
|
REQUIRE_THAT(R[1][1], Catch::Matchers::WithinRel(0.63246f, 1e-4f));
|
||||||
// }
|
}
|
||||||
|
|
||||||
SECTION("3x3 QRDecomposition") {
|
SECTION("3x3 QRDecomposition") {
|
||||||
// this symmetrix tridiagonal matrix is well behaved for testing
|
// this symmetrix tridiagonal matrix is well behaved for testing
|
||||||
|
|||||||
Reference in New Issue
Block a user