Updated merge checker and seperated the matrix tests fro mthe timing tests

unit-tests/matrix-tests.cpp

@@ -10,15 +10,13 @@
 #include <cmath>
 #include <iostream>
 
-TEST_CASE("Elementary Matrix Operations", "Matrix")
-{
+TEST_CASE("Elementary Matrix Operations", "Matrix") {
   std::array<float, 4> arr2{5, 6, 7, 8};
   Matrix<2, 2> mat1{1, 2, 3, 4};
   Matrix<2, 2> mat2{arr2};
   Matrix<2, 2> mat3{};
 
-  SECTION("Initialization")
-  {
+  SECTION("Initialization") {
     // array initialization
     REQUIRE(mat1.Get(0, 0) == 1);
     REQUIRE(mat1.Get(0, 1) == 2);
@@ -40,17 +38,14 @@ TEST_CASE("Elementary Matrix Operations", "Matrix")
     // large matrix
     Matrix<255, 255> mat6{};
     mat6.Fill(4);
-    for (uint8_t row{0}; row < 255; row++)
-    {
-      for (uint8_t column{0}; column < 255; column++)
-      {
+    for (uint8_t row{0}; row < 255; row++) {
+      for (uint8_t column{0}; column < 255; column++) {
         REQUIRE(mat6.Get(row, column) == 4);
       }
     }
   }
 
-  SECTION("Fill")
-  {
+  SECTION("Fill") {
     mat1.Fill(0);
     REQUIRE(mat1.Get(0, 0) == 0);
     REQUIRE(mat1.Get(0, 1) == 0);
@@ -70,12 +65,10 @@ TEST_CASE("Elementary Matrix Operations", "Matrix")
     REQUIRE(mat3.Get(1, 1) == -20);
   }
 
-  SECTION("Addition")
-  {
+  SECTION("Addition") {
     std::string strBuf1 = "";
     mat1.ToString(strBuf1);
-    std::cout << "Matrix 1:\n"
-              << strBuf1 << std::endl;
+    std::cout << "Matrix 1:\n" << strBuf1 << std::endl;
 
     mat1.Add(mat2, mat3);
 
@@ -93,8 +86,7 @@ TEST_CASE("Elementary Matrix Operations", "Matrix")
     REQUIRE(mat3.Get(1, 1) == 12);
   }
 
-  SECTION("Subtraction")
-  {
+  SECTION("Subtraction") {
     mat1.Sub(mat2, mat3);
 
     REQUIRE(mat3.Get(0, 0) == -4);
@@ -111,8 +103,7 @@ TEST_CASE("Elementary Matrix Operations", "Matrix")
     REQUIRE(mat3.Get(1, 1) == -4);
   }
 
-  SECTION("Multiplication")
-  {
+  SECTION("Multiplication") {
     mat1.Mult(mat2, mat3);
 
     REQUIRE(mat3.Get(0, 0) == 19);
@@ -131,8 +122,7 @@ TEST_CASE("Elementary Matrix Operations", "Matrix")
     // TODO: You need to add non-square multiplications to this.
   }
 
-  SECTION("Scalar Multiplication")
-  {
+  SECTION("Scalar Multiplication") {
     mat1.Mult(2, mat3);
 
     REQUIRE(mat3.Get(0, 0) == 2);
@@ -141,8 +131,7 @@ TEST_CASE("Elementary Matrix Operations", "Matrix")
     REQUIRE(mat3.Get(1, 1) == 8);
   }
 
-  SECTION("Element Multiply")
-  {
+  SECTION("Element Multiply") {
     mat1.ElementMultiply(mat2, mat3);
 
     REQUIRE(mat3.Get(0, 0) == 5);
@@ -151,8 +140,7 @@ TEST_CASE("Elementary Matrix Operations", "Matrix")
     REQUIRE(mat3.Get(1, 1) == 32);
   }
 
-  SECTION("Element Divide")
-  {
+  SECTION("Element Divide") {
     mat1.ElementDivide(mat2, mat3);
 
     REQUIRE_THAT(mat3.Get(0, 0), Catch::Matchers::WithinRel(0.2f, 1e-6f));
@@ -161,8 +149,7 @@ TEST_CASE("Elementary Matrix Operations", "Matrix")
     REQUIRE_THAT(mat3.Get(1, 1), Catch::Matchers::WithinRel(0.5f, 1e-6f));
   }
 
-  SECTION("Minor Matrix")
-  {
+  SECTION("Minor Matrix") {
     // what about matrices of 0,0 or 1,1?
     // minor matrix for 2x2 matrix
     Matrix<1, 1> minorMat1{};
@@ -198,8 +185,7 @@ TEST_CASE("Elementary Matrix Operations", "Matrix")
     REQUIRE(minorMat4.Get(1, 1) == 5);
   }
 
-  SECTION("Determinant")
-  {
+  SECTION("Determinant") {
     float det1 = mat1.Det();
 
     REQUIRE_THAT(det1, Catch::Matchers::WithinRel(-2.0F, 1e-6f));
@@ -216,8 +202,7 @@ TEST_CASE("Elementary Matrix Operations", "Matrix")
     REQUIRE_THAT(det5, Catch::Matchers::WithinRel(6.0F, 1e-6f));
   }
 
-  SECTION("Matrix of Minors")
-  {
+  SECTION("Matrix of Minors") {
     mat1.MatrixOfMinors(mat3);
     REQUIRE_THAT(mat3.Get(0, 0), Catch::Matchers::WithinRel(4.0F, 1e-6f));
     REQUIRE_THAT(mat3.Get(0, 1), Catch::Matchers::WithinRel(3.0F, 1e-6f));
@@ -238,8 +223,7 @@ TEST_CASE("Elementary Matrix Operations", "Matrix")
     REQUIRE_THAT(mat5.Get(2, 2), Catch::Matchers::WithinRel(-3.0F, 1e-6f));
   }
 
-  SECTION("Invert")
-  {
+  SECTION("Invert") {
     mat3 = mat1.Invert();
     REQUIRE_THAT(mat3.Get(0, 0), Catch::Matchers::WithinRel(-2.0F, 1e-6f));
     REQUIRE_THAT(mat3.Get(0, 1), Catch::Matchers::WithinRel(1.0F, 1e-6f));
@@ -247,8 +231,7 @@ TEST_CASE("Elementary Matrix Operations", "Matrix")
     REQUIRE_THAT(mat3.Get(1, 1), Catch::Matchers::WithinRel(-0.5F, 1e-6f));
   };
 
-  SECTION("Transpose")
-  {
+  SECTION("Transpose") {
     // transpose a square matrix
     mat3 = mat1.Transpose();
 
@@ -271,8 +254,7 @@ TEST_CASE("Elementary Matrix Operations", "Matrix")
     REQUIRE(mat5.Get(2, 1) == 6);
   }
 
-  SECTION("Normalize")
-  {
+  SECTION("Normalize") {
     mat1.Normalize(mat3);
 
     float sqrt_30{sqrt(30)};
@@ -292,8 +274,7 @@ TEST_CASE("Elementary Matrix Operations", "Matrix")
                  Catch::Matchers::WithinRel(0.957591346325f, 1e-6f));
   }
 
-  SECTION("GET ROW")
-  {
+  SECTION("GET ROW") {
     Matrix<1, 2> mat1Rows{};
     mat1.GetRow(0, mat1Rows);
     REQUIRE(mat1Rows.Get(0, 0) == 1);
@@ -304,8 +285,7 @@ TEST_CASE("Elementary Matrix Operations", "Matrix")
     REQUIRE(mat1Rows.Get(0, 1) == 4);
   }
 
-  SECTION("GET COLUMN")
-  {
+  SECTION("GET COLUMN") {
     Matrix<2, 1> mat1Columns{};
     mat1.GetColumn(0, mat1Columns);
     REQUIRE(mat1Columns.Get(0, 0) == 1);
@@ -316,12 +296,8 @@ TEST_CASE("Elementary Matrix Operations", "Matrix")
     REQUIRE(mat1Columns.Get(1, 0) == 4);
   }
 
-  SECTION("Get Sub-Matrices")
-  {
-    Matrix<3, 3> mat4{
-        1, 2, 3,
-        4, 5, 6,
-        7, 8, 9};
+  SECTION("Get Sub-Matrices") {
+    Matrix<3, 3> mat4{1, 2, 3, 4, 5, 6, 7, 8, 9};
 
     Matrix<2, 2> mat5 = mat4.SubMatrix<2, 2, 0, 0>();
 
@@ -347,12 +323,8 @@ TEST_CASE("Elementary Matrix Operations", "Matrix")
     REQUIRE(mat7.Get(0, 2) == 3);
   }
 
-  SECTION("Set Sub-Matrices")
-  {
-    Matrix<3, 3> startMatrix{
-        1, 2, 3,
-        4, 5, 6,
-        7, 8, 9};
+  SECTION("Set Sub-Matrices") {
+    Matrix<3, 3> startMatrix{1, 2, 3, 4, 5, 6, 7, 8, 9};
     Matrix<3, 3> mat4 = startMatrix;
 
     Matrix<2, 2> mat5{10, 11, 12, 13};
@@ -381,144 +353,4 @@ TEST_CASE("Elementary Matrix Operations", "Matrix")
     REQUIRE(mat4.Get(0, 1) == 11);
     REQUIRE(mat4.Get(0, 2) == 12);
   }
-}
-
-// basically re-run all of the previous tests with huge matrices and time the
-// results.
-TEST_CASE("Timing Tests", "Matrix")
-{
-  std::array<float, 50 * 50> arr1{};
-  for (uint16_t i{0}; i < 50 * 50; i++)
-  {
-    arr1[i] = i;
-  }
-  std::array<float, 50 * 50> arr2{5, 6, 7, 8};
-  for (uint16_t i{50 * 50}; i < 2 * 50 * 50; i++)
-  {
-    arr2[i] = i;
-  }
-  Matrix<50, 50> mat1{arr1};
-  Matrix<50, 50> mat2{arr2};
-  Matrix<50, 50> mat3{};
-
-  // A smaller matrix to use for really badly optimized operations
-  Matrix<4, 4> mat4{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
-  Matrix<4, 4> mat5{};
-
-  SECTION("Addition")
-  {
-    for (uint32_t i{0}; i < 10000; i++)
-    {
-      mat3 = mat1 + mat2;
-    }
-  }
-
-  SECTION("Subtraction")
-  {
-    for (uint32_t i{0}; i < 10000; i++)
-    {
-      mat3 = mat1 - mat2;
-    }
-  }
-
-  SECTION("Multiplication")
-  {
-    for (uint32_t i{0}; i < 1000; i++)
-    {
-      mat3 = mat1 * mat2;
-    }
-  }
-
-  SECTION("Scalar Multiplication")
-  {
-    for (uint32_t i{0}; i < 10000; i++)
-    {
-      mat3 = mat1 * 3;
-    }
-  }
-
-  SECTION("Element Multiply")
-  {
-    for (uint32_t i{0}; i < 10000; i++)
-    {
-      mat1.ElementMultiply(mat2, mat3);
-    }
-  }
-
-  SECTION("Element Divide")
-  {
-    for (uint32_t i{0}; i < 10000; i++)
-    {
-      mat1.ElementDivide(mat2, mat3);
-    }
-  }
-
-  SECTION("Minor Matrix")
-  {
-    // what about matrices of 0,0 or 1,1?
-    // minor matrix for 2x2 matrix
-    Matrix<49, 49> minorMat1{};
-    for (uint32_t i{0}; i < 10000; i++)
-    {
-      mat1.MinorMatrix(minorMat1, 0, 0);
-    }
-  }
-
-  SECTION("Determinant")
-  {
-    for (uint32_t i{0}; i < 100000; i++)
-    {
-      float det1 = mat4.Det();
-    }
-  }
-
-  SECTION("Matrix of Minors")
-  {
-    for (uint32_t i{0}; i < 100000; i++)
-    {
-      mat4.MatrixOfMinors(mat5);
-    }
-  }
-
-  SECTION("Invert")
-  {
-    for (uint32_t i{0}; i < 100000; i++)
-    {
-      mat5 = mat4.Invert();
-    }
-  };
-
-  SECTION("Transpose")
-  {
-    for (uint32_t i{0}; i < 10000; i++)
-    {
-      mat3 = mat1.Transpose();
-    }
-  }
-
-  SECTION("Normalize")
-  {
-    for (uint32_t i{0}; i < 10000; i++)
-    {
-      mat1.Normalize(mat3);
-    }
-  }
-
-  SECTION("GET ROW")
-  {
-    Matrix<1, 50> mat1Rows{};
-    for (uint32_t i{0}; i < 1000000; i++)
-    {
-      mat1.GetRow(0, mat1Rows);
-    }
-  }
-
-  SECTION("GET COLUMN")
-  {
-    Matrix<50, 1> mat1Columns{};
-    for (uint32_t i{0}; i < 1000000; i++)
-    {
-      mat1.GetColumn(0, mat1Columns);
-    }
-  }
 }