mirror of
https://github.com/orange-cpp/omath.git
synced 2026-02-13 07:03:25 +00:00
improved matrix tests
This commit is contained in:
@@ -11,6 +11,7 @@ namespace omath
|
||||
class Matrix final
|
||||
{
|
||||
public:
|
||||
Matrix();
|
||||
Matrix(size_t rows, size_t columns);
|
||||
|
||||
Matrix(const std::initializer_list<std::initializer_list<float>>& rows);
|
||||
@@ -99,8 +100,8 @@ namespace omath
|
||||
~Matrix();
|
||||
|
||||
private:
|
||||
size_t m_rows = 0;
|
||||
size_t m_columns = 0;
|
||||
std::unique_ptr<float[]> m_data = nullptr;
|
||||
size_t m_rows;
|
||||
size_t m_columns;
|
||||
std::unique_ptr<float[]> m_data;
|
||||
};
|
||||
}
|
||||
@@ -83,6 +83,10 @@ namespace omath
|
||||
m_columns = other.m_columns;
|
||||
m_data = std::move(other.m_data);
|
||||
|
||||
other.m_rows = 0;
|
||||
other.m_columns = 0;
|
||||
|
||||
other.m_data = nullptr;
|
||||
}
|
||||
|
||||
size_t Matrix::ColumnsCount() const noexcept
|
||||
@@ -367,4 +371,11 @@ namespace omath
|
||||
for (size_t i = 0; i < m_columns*m_rows; ++i)
|
||||
At(i / m_rows, i % m_columns) = pRawMatrix[i];
|
||||
}
|
||||
|
||||
Matrix::Matrix()
|
||||
{
|
||||
m_columns = 0;
|
||||
m_rows = 0;
|
||||
m_data = nullptr;
|
||||
}
|
||||
}
|
||||
@@ -3,15 +3,179 @@
|
||||
//
|
||||
#include <gtest/gtest.h>
|
||||
#include <omath/Matrix.h>
|
||||
#include <print>
|
||||
#include "omath/Vector3.h"
|
||||
|
||||
using namespace omath;
|
||||
|
||||
|
||||
TEST(UnitTestMatrix, ToString)
|
||||
class UnitTestMatrix : public ::testing::Test
|
||||
{
|
||||
omath::Matrix matrix(2, 2);
|
||||
matrix.Set(1.1);
|
||||
const auto str = matrix.ToSrtring();
|
||||
|
||||
std::cout << str;
|
||||
protected:
|
||||
Matrix m1;
|
||||
Matrix m2;
|
||||
|
||||
void SetUp() override {
|
||||
m1 = Matrix(2, 2);
|
||||
m2 = Matrix{{1.0f, 2.0f}, {3.0f, 4.0f}};
|
||||
}
|
||||
};
|
||||
|
||||
// Test constructors
|
||||
TEST_F(UnitTestMatrix, Constructor_Size)
|
||||
{
|
||||
Matrix m(3, 3);
|
||||
EXPECT_EQ(m.RowCount(), 3);
|
||||
EXPECT_EQ(m.ColumnsCount(), 3);
|
||||
}
|
||||
|
||||
TEST_F(UnitTestMatrix, Constructor_InitializerList)
|
||||
{
|
||||
Matrix m{{1.0f, 2.0f}, {3.0f, 4.0f}};
|
||||
EXPECT_EQ(m.RowCount(), 2);
|
||||
EXPECT_EQ(m.ColumnsCount(), 2);
|
||||
EXPECT_FLOAT_EQ(m.At(0, 0), 1.0f);
|
||||
EXPECT_FLOAT_EQ(m.At(1, 1), 4.0f);
|
||||
}
|
||||
|
||||
TEST_F(UnitTestMatrix, Constructor_Copy)
|
||||
{
|
||||
Matrix m3 = m2;
|
||||
EXPECT_EQ(m3.RowCount(), m2.RowCount());
|
||||
EXPECT_EQ(m3.ColumnsCount(), m2.ColumnsCount());
|
||||
EXPECT_FLOAT_EQ(m3.At(0, 0), m2.At(0, 0));
|
||||
}
|
||||
|
||||
TEST_F(UnitTestMatrix, Constructor_Move)
|
||||
{
|
||||
Matrix m3 = std::move(m2);
|
||||
EXPECT_EQ(m3.RowCount(), 2);
|
||||
EXPECT_EQ(m3.ColumnsCount(), 2);
|
||||
EXPECT_FLOAT_EQ(m3.At(0, 0), 1.0f);
|
||||
EXPECT_EQ(m2.RowCount(), 0); // m2 should be empty after the move
|
||||
EXPECT_EQ(m2.ColumnsCount(), 0);
|
||||
}
|
||||
|
||||
// Test matrix operations
|
||||
TEST_F(UnitTestMatrix, Operator_Multiplication_Matrix)
|
||||
{
|
||||
Matrix m3 = m2 * m2;
|
||||
EXPECT_EQ(m3.RowCount(), 2);
|
||||
EXPECT_EQ(m3.ColumnsCount(), 2);
|
||||
EXPECT_FLOAT_EQ(m3.At(0, 0), 7.0f);
|
||||
EXPECT_FLOAT_EQ(m3.At(1, 1), 22.0f);
|
||||
}
|
||||
|
||||
TEST_F(UnitTestMatrix, Operator_Multiplication_Vector3)
|
||||
{
|
||||
Vector3 v(1.0f, 2.0f, 3.0f);
|
||||
Matrix m3(3, 3, new float[9]{1, 0, 0, 0, 1, 0, 0, 0, 1});
|
||||
Matrix result = m3 * v;
|
||||
|
||||
EXPECT_FLOAT_EQ(result.At(0, 0), 1.0f);
|
||||
EXPECT_FLOAT_EQ(result.At(1, 0), 2.0f);
|
||||
EXPECT_FLOAT_EQ(result.At(2, 0), 3.0f);
|
||||
}
|
||||
|
||||
TEST_F(UnitTestMatrix, Operator_Multiplication_Scalar)
|
||||
{
|
||||
Matrix m3 = m2 * 2.0f;
|
||||
EXPECT_FLOAT_EQ(m3.At(0, 0), 2.0f);
|
||||
EXPECT_FLOAT_EQ(m3.At(1, 1), 8.0f);
|
||||
}
|
||||
|
||||
TEST_F(UnitTestMatrix, Operator_Division_Scalar)
|
||||
{
|
||||
Matrix m3 = m2 / 2.0f;
|
||||
EXPECT_FLOAT_EQ(m3.At(0, 0), 0.5f);
|
||||
EXPECT_FLOAT_EQ(m3.At(1, 1), 2.0f);
|
||||
}
|
||||
|
||||
// Test matrix functions
|
||||
TEST_F(UnitTestMatrix, Transpose)
|
||||
{
|
||||
Matrix m3 = m2.Transpose();
|
||||
EXPECT_FLOAT_EQ(m3.At(0, 1), 3.0f);
|
||||
EXPECT_FLOAT_EQ(m3.At(1, 0), 2.0f);
|
||||
}
|
||||
|
||||
TEST_F(UnitTestMatrix, Determinant)
|
||||
{
|
||||
float det = m2.Determinant();
|
||||
EXPECT_FLOAT_EQ(det, -2.0f);
|
||||
}
|
||||
|
||||
TEST_F(UnitTestMatrix, Minor)
|
||||
{
|
||||
float minor = m2.Minor(0, 0);
|
||||
EXPECT_FLOAT_EQ(minor, 4.0f);
|
||||
}
|
||||
|
||||
TEST_F(UnitTestMatrix, AlgComplement)
|
||||
{
|
||||
float algComp = m2.AlgComplement(0, 0);
|
||||
EXPECT_FLOAT_EQ(algComp, 4.0f);
|
||||
}
|
||||
|
||||
TEST_F(UnitTestMatrix, Strip)
|
||||
{
|
||||
Matrix m3 = m2.Strip(0, 0);
|
||||
EXPECT_EQ(m3.RowCount(), 1);
|
||||
EXPECT_EQ(m3.ColumnsCount(), 1);
|
||||
EXPECT_FLOAT_EQ(m3.At(0, 0), 4.0f);
|
||||
}
|
||||
|
||||
TEST_F(UnitTestMatrix, ProjectionMatrix)
|
||||
{
|
||||
Matrix proj = Matrix::ProjectionMatrix(45.0f, 1.33f, 0.1f, 100.0f);
|
||||
EXPECT_EQ(proj.RowCount(), 4);
|
||||
EXPECT_EQ(proj.ColumnsCount(), 4);
|
||||
// Further checks on projection matrix elements could be added
|
||||
}
|
||||
|
||||
// Test other member functions
|
||||
TEST_F(UnitTestMatrix, Set)
|
||||
{
|
||||
m1.Set(3.0f);
|
||||
EXPECT_FLOAT_EQ(m1.At(0, 0), 3.0f);
|
||||
EXPECT_FLOAT_EQ(m1.At(1, 1), 3.0f);
|
||||
}
|
||||
|
||||
TEST_F(UnitTestMatrix, Sum)
|
||||
{
|
||||
float sum = m2.Sum();
|
||||
EXPECT_FLOAT_EQ(sum, 10.0f);
|
||||
}
|
||||
|
||||
TEST_F(UnitTestMatrix, Clear)
|
||||
{
|
||||
m2.Clear();
|
||||
EXPECT_FLOAT_EQ(m2.At(0, 0), 0.0f);
|
||||
EXPECT_FLOAT_EQ(m2.At(1, 1), 0.0f);
|
||||
}
|
||||
|
||||
TEST_F(UnitTestMatrix, ToString)
|
||||
{
|
||||
std::string str = m2.ToSrtring();
|
||||
EXPECT_FALSE(str.empty());
|
||||
}
|
||||
|
||||
// Test assignment operators
|
||||
TEST_F(UnitTestMatrix, AssignmentOperator_Copy)
|
||||
{
|
||||
Matrix m3(2, 2);
|
||||
m3 = m2;
|
||||
EXPECT_EQ(m3.RowCount(), m2.RowCount());
|
||||
EXPECT_EQ(m3.ColumnsCount(), m2.ColumnsCount());
|
||||
EXPECT_FLOAT_EQ(m3.At(0, 0), m2.At(0, 0));
|
||||
}
|
||||
|
||||
TEST_F(UnitTestMatrix, AssignmentOperator_Move)
|
||||
{
|
||||
Matrix m3(2, 2);
|
||||
m3 = std::move(m2);
|
||||
EXPECT_EQ(m3.RowCount(), 2);
|
||||
EXPECT_EQ(m3.ColumnsCount(), 2);
|
||||
EXPECT_FLOAT_EQ(m3.At(0, 0), 1.0f);
|
||||
EXPECT_EQ(m2.RowCount(), 0); // m2 should be empty after the move
|
||||
EXPECT_EQ(m2.ColumnsCount(), 0);
|
||||
}
|
||||
Reference in New Issue
Block a user