SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

fix tests and pimathmatrix.h

Browse Source
This commit is contained in:
Бычков Андрей
2020-10-22 18:56:01 +03:00
parent 85dc0a4dc4
commit fa85f414db
3 changed files with 794 additions and 853 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/main/math/pimathmatrix.h
View File

@@ -769,7 +769,7 @@ public:
* @return matrix type _CMatrix * @return matrix type _CMatrix
*/ */
_CMatrix &setCol(uint index, const PIMathVector<Type> &v) { _CMatrix &setCol(uint index, const PIMathVector<Type> &v) {
assert(_V2D::rows == v.size()); assert(_V2D::rows() == v.size());
PIMM_FOR_R _V2D::element(i, index) = v[i]; PIMM_FOR_R _V2D::element(i, index) = v[i];
return *this; return *this;
} }
@@ -782,7 +782,7 @@ public:
* @return matrix type _CMatrix * @return matrix type _CMatrix
*/ */
_CMatrix &setRow(uint index, const PIMathVector<Type> &v) { _CMatrix &setRow(uint index, const PIMathVector<Type> &v) {
assert(_V2D::cols == v.size()); assert(_V2D::cols() == v.size());
PIMM_FOR_C _V2D::element(index, i) = v[i]; PIMM_FOR_C _V2D::element(index, i) = v[i];
return *this; return *this;
} }

144
tests/math/testpimathmatrix.cpp
View File

@@ -111,18 +111,18 @@ TEST(PIMathMatrix_Test, swapCols) {
double a1[3], a2[3], a3[3]; double a1[3], a2[3], a3[3];
double b1[3], b2[3], b3[3]; double b1[3], b2[3], b3[3];
vector.resize(3, 3.0); vector.resize(3, 3.0);
vector.at(0) = 3.0; vector[0] = 3.0;
vector.at(1) = 6.0; vector[1] = 6.0;
vector.at(2) = 8.0; vector[2] = 8.0;
matrix1 = origMatr.identity(3, 3); matrix1 = origMatr.identity(3, 3);
matrix1.setCol(0, vector); matrix1.setCol(0, vector);
vector.at(0) = 2.0; vector[0] = 2.0;
vector.at(1) = 1.0; vector[1] = 1.0;
vector.at(2) = 4.0; vector[2] = 4.0;
matrix1.setCol(1, vector); matrix1.setCol(1, vector);
vector.at(0) = 6.0; vector[0] = 6.0;
vector.at(1) = 2.0; vector[1] = 2.0;
vector.at(2) = 5.0; vector[2] = 5.0;
matrix1.setCol(2, vector); matrix1.setCol(2, vector);
for(int i = 0; i < 3; i++) { for(int i = 0; i < 3; i++) {
a1[i] = matrix1.element(i, 0); a1[i] = matrix1.element(i, 0);
@@ -146,18 +146,18 @@ TEST(PIMathMatrix_Test, swapRows) {
double a1[3], a2[3], a3[3]; double a1[3], a2[3], a3[3];
double b1[3], b2[3], b3[3]; double b1[3], b2[3], b3[3];
vector.resize(3, 3.0); vector.resize(3, 3.0);
vector.at(0) = 3.0; vector[0] = 3.0;
vector.at(1) = 6.0; vector[1] = 6.0;
vector.at(2) = 8.0; vector[2] = 8.0;
matrix1 = origMatr.identity(3, 3); matrix1 = origMatr.identity(3, 3);
matrix1.setCol(0, vector); matrix1.setCol(0, vector);
vector.at(0) = 2.0; vector[0] = 2.0;
vector.at(1) = 1.0; vector[1] = 1.0;
vector.at(2) = 4.0; vector[2] = 4.0;
matrix1.setCol(1, vector); matrix1.setCol(1, vector);
vector.at(0) = 6.0; vector[0] = 6.0;
vector.at(1) = 2.0; vector[1] = 2.0;
vector.at(2) = 5.0; vector[2] = 5.0;
matrix1.setCol(2, vector); matrix1.setCol(2, vector);
for(int i = 0; i < 3; i++) { for(int i = 0; i < 3; i++) {
a1[i] = matrix1.element(0, i); a1[i] = matrix1.element(0, i);
@@ -339,17 +339,17 @@ TEST(PIMathMatrix_Test, determinantIfSquare) {
PIMathMatrix<double> matrix(3, 3, 0.0); PIMathMatrix<double> matrix(3, 3, 0.0);
PIMathVector<double> vector; PIMathVector<double> vector;
vector.resize(3, 3.0); vector.resize(3, 3.0);
vector.at(0) = 3.0; vector[0] = 3.0;
vector.at(1) = 6.0; vector[1] = 6.0;
vector.at(2) = 8.0; vector[2] = 8.0;
matrix.setCol(0, vector); matrix.setCol(0, vector);
vector.at(0) = 2.0; vector[0] = 2.0;
vector.at(1) = 1.0; vector[1] = 1.0;
vector.at(2) = 4.0; vector[2] = 4.0;
matrix.setCol(1, vector); matrix.setCol(1, vector);
vector.at(0) = 6.0; vector[0] = 6.0;
vector.at(1) = 2.0; vector[1] = 2.0;
vector.at(2) = 5.0; vector[2] = 5.0;
matrix.setCol(2, vector); matrix.setCol(2, vector);
d = matrix.determinant(); d = matrix.determinant();
ASSERT_DOUBLE_EQ(d, i); ASSERT_DOUBLE_EQ(d, i);
@@ -367,17 +367,17 @@ TEST(PIMathMatrix_Test, trace) {
double i = 9.0; double i = 9.0;
PIMathVector<double> vector; PIMathVector<double> vector;
vector.resize(3, 3.0); vector.resize(3, 3.0);
vector.at(0) = 3.0; vector[0] = 3.0;
vector.at(1) = 6.0; vector[1] = 6.0;
vector.at(2) = 8.0; vector[2] = 8.0;
matrix.setCol(0, vector); matrix.setCol(0, vector);
vector.at(0) = 2.0; vector[0] = 2.0;
vector.at(1) = 1.0; vector[1] = 1.0;
vector.at(2) = 4.0; vector[2] = 4.0;
matrix.setCol(1, vector); matrix.setCol(1, vector);
vector.at(0) = 6.0; vector[0] = 6.0;
vector.at(1) = 2.0; vector[1] = 2.0;
vector.at(2) = 5.0; vector[2] = 5.0;
matrix.setCol(2, vector); matrix.setCol(2, vector);
t = matrix.trace(); t = matrix.trace();
ASSERT_DOUBLE_EQ(t, i); ASSERT_DOUBLE_EQ(t, i);
@@ -395,17 +395,17 @@ TEST(PIMathMatrix_Test, toUpperTriangular) {
int i; int i;
PIMathVector<double> vector; PIMathVector<double> vector;
vector.resize(3, 3.0); vector.resize(3, 3.0);
vector.at(0) = 3.0; vector[0] = 3.0;
vector.at(1) = 6.0; vector[1] = 6.0;
vector.at(2) = 8.0; vector[2] = 8.0;
matrix.setCol(0, vector); matrix.setCol(0, vector);
vector.at(0) = 2.0; vector[0] = 2.0;
vector.at(1) = 1.0; vector[1] = 1.0;
vector.at(2) = 4.0; vector[2] = 4.0;
matrix.setCol(1, vector); matrix.setCol(1, vector);
vector.at(0) = 6.0; vector[0] = 6.0;
vector.at(1) = 2.0; vector[1] = 2.0;
vector.at(2) = 5.0; vector[2] = 5.0;
matrix.setCol(2, vector); matrix.setCol(2, vector);
d1 = matrix.determinant(); d1 = matrix.determinant();
matrix.toUpperTriangular(); matrix.toUpperTriangular();
@@ -424,17 +424,17 @@ TEST(PIMathMatrix_Test, invert) {
PIMathMatrix<double> matrix4(3, 3, 0.0); PIMathMatrix<double> matrix4(3, 3, 0.0);
PIMathVector<double> vector; PIMathVector<double> vector;
vector.resize(3, 3.0); vector.resize(3, 3.0);
vector.at(0) = 3.0; vector[0] = 3.0;
vector.at(1) = 6.0; vector[1] = 6.0;
vector.at(2) = 8.0; vector[2] = 8.0;
matrix1.setCol(0, vector); matrix1.setCol(0, vector);
vector.at(0) = 2.0; vector[0] = 2.0;
vector.at(1) = 1.0; vector[1] = 1.0;
vector.at(2) = 4.0; vector[2] = 4.0;
matrix1.setCol(1, vector); matrix1.setCol(1, vector);
vector.at(0) = 6.0; vector[0] = 6.0;
vector.at(1) = 2.0; vector[1] = 2.0;
vector.at(2) = 5.0; vector[2] = 5.0;
matrix1.setCol(2, vector); matrix1.setCol(2, vector);
d1 = matrix1.determinant(); d1 = matrix1.determinant();
matrix2 = matrix1; matrix2 = matrix1;
@@ -452,17 +452,17 @@ TEST(PIMathMatrix_Test, inverted) {
PIMathMatrix<double> matrix4(3, 3, 0.0); PIMathMatrix<double> matrix4(3, 3, 0.0);
PIMathVector<double> vector; PIMathVector<double> vector;
vector.resize(3, 3.0); vector.resize(3, 3.0);
vector.at(0) = 3.0; vector[0] = 3.0;
vector.at(1) = 6.0; vector[1] = 6.0;
vector.at(2) = 8.0; vector[2] = 8.0;
matrix1.setCol(0, vector); matrix1.setCol(0, vector);
vector.at(0) = 2.0; vector[0] = 2.0;
vector.at(1) = 1.0; vector[1] = 1.0;
vector.at(2) = 4.0; vector[2] = 4.0;
matrix1.setCol(1, vector); matrix1.setCol(1, vector);
vector.at(0) = 6.0; vector[0] = 6.0;
vector.at(1) = 2.0; vector[1] = 2.0;
vector.at(2) = 5.0; vector[2] = 5.0;
matrix1.setCol(2, vector); matrix1.setCol(2, vector);
d1 = matrix1.determinant(); d1 = matrix1.determinant();
matrix2 = matrix1; matrix2 = matrix1;
@@ -480,18 +480,18 @@ TEST(PIMathMatrix_Test, transposed) {
PIMathMatrix<double> matrix3; PIMathMatrix<double> matrix3;
PIMathVector<double> vector; PIMathVector<double> vector;
vector.resize(3, 3.0); vector.resize(3, 3.0);
vector.at(0) = 3.0; vector[0] = 3.0;
vector.at(1) = 6.0; vector[1] = 6.0;
vector.at(2) = 8.0; vector[2] = 8.0;
matrix1 = origMatr.identity(3, 3); matrix1 = origMatr.identity(3, 3);
matrix1.setCol(0, vector); matrix1.setCol(0, vector);
vector.at(0) = 2.0; vector[0] = 2.0;
vector.at(1) = 1.0; vector[1] = 1.0;
vector.at(2) = 4.0; vector[2] = 4.0;
matrix1.setCol(1, vector); matrix1.setCol(1, vector);
vector.at(0) = 6.0; vector[0] = 6.0;
vector.at(1) = 2.0; vector[1] = 2.0;
vector.at(2) = 5.0; vector[2] = 5.0;
matrix1.setCol(2, vector); matrix1.setCol(2, vector);
d1 = matrix1.determinant(); d1 = matrix1.determinant();
matrix2 = matrix1.transposed(); matrix2 = matrix1.transposed();

373
tests/math/testpimathmatrixt.cpp
View File

@@ -45,7 +45,7 @@ TEST(PIMathMatrixT_Test, at) {
ASSERT_TRUE(true); ASSERT_TRUE(true);
} }
TEST(PIMathMatrixT_Test, filled) { TEST(PIMathMatrixT_Test, filled) {
auto matr = PIMathMatrixT<rows, cols, double>::filled(1.0); auto matr = PIMathMatrixT<rows, cols, double>(1.0);
ASSERT_TRUE(cmpSquareMatrixWithValue(matr, 1.0, rows)); ASSERT_TRUE(cmpSquareMatrixWithValue(matr, 1.0, rows));
} }
@@ -63,18 +63,18 @@ TEST(PIMathMatrixT_Test, col) {
PIMathMatrixT<rows, cols, double> matr; PIMathMatrixT<rows, cols, double> matr;
PIMathVectorT<rows, double> vect; PIMathVectorT<rows, double> vect;
uint g = 2; uint g = 2;
matr.at(0,0) = 3; matr.element(0,0) = 3;
matr.at(0,1) = 6; matr.element(0,1) = 6;
matr.at(0,2) = 8; matr.element(0,2) = 8;
matr.at(1,0) = 2; matr.element(1,0) = 2;
matr.at(1,1) = 1; matr.element(1,1) = 1;
matr.at(1,2) = 4; matr.element(1,2) = 4;
matr.at(2,0) = 6; matr.element(2,0) = 6;
matr.at(2,1) = 2; matr.element(2,1) = 2;
matr.at(2,2) = 5; matr.element(2,2) = 5;
vect = matr.col(g); vect = matr.col(g);
for(uint i = 0; i < matr.cols(); i++) { for(uint i = 0; i < matr.cols(); i++) {
if(matr.at(i, g) != vect.at(i)) { if(matr.element(i, g) != vect[i]) {
ASSERT_TRUE(false); ASSERT_TRUE(false);
} }
} }
@@ -85,18 +85,18 @@ TEST(PIMathMatrixT_Test, row) {
PIMathMatrixT<rows, cols, double> matr; PIMathMatrixT<rows, cols, double> matr;
PIMathVectorT<rows, double> vect; PIMathVectorT<rows, double> vect;
uint g = 2; uint g = 2;
matr.at(0,0) = 3; matr.element(0,0) = 3;
matr.at(0,1) = 6; matr.element(0,1) = 6;
matr.at(0,2) = 8; matr.element(0,2) = 8;
matr.at(1,0) = 2; matr.element(1,0) = 2;
matr.at(1,1) = 1; matr.element(1,1) = 1;
matr.at(1,2) = 4; matr.element(1,2) = 4;
matr.at(2,0) = 6; matr.element(2,0) = 6;
matr.at(2,1) = 2; matr.element(2,1) = 2;
matr.at(2,2) = 5; matr.element(2,2) = 5;
vect = matr.row(g); vect = matr.row(g);
for(uint i = 0; i < matr.rows(); i++) { for(uint i = 0; i < matr.rows(); i++) {
if(matr.at(g, i) != vect.at(i)) { if(matr.element(g, i) != vect[i]) {
ASSERT_TRUE(false); ASSERT_TRUE(false);
} }
} }
@@ -106,13 +106,13 @@ TEST(PIMathMatrixT_Test, row) {
TEST(PIMathMatrixT_Test, setCol) { TEST(PIMathMatrixT_Test, setCol) {
PIMathMatrixT<rows, cols, double> matr; PIMathMatrixT<rows, cols, double> matr;
PIMathVectorT<rows, double> vect; PIMathVectorT<rows, double> vect;
vect.at(0) = 1.0; vect[0] = 1.0;
vect.at(1) = 3.0; vect[1] = 3.0;
vect.at(2) = 5.0; vect[2] = 5.0;
uint g = 1; uint g = 1;
matr.setCol(g, vect); matr.setCol(g, vect);
for(uint i = 0; i < vect.size(); i++) { for(uint i = 0; i < vect.size(); i++) {
if(matr.at(i, g) != vect.at(i)) { if(matr.element(i, g) != vect[i]) {
ASSERT_TRUE(false); ASSERT_TRUE(false);
} }
} }
@@ -122,13 +122,13 @@ TEST(PIMathMatrixT_Test, setCol) {
TEST(PIMathMatrixT_Test, setRow) { TEST(PIMathMatrixT_Test, setRow) {
PIMathMatrixT<rows, cols, double> matr; PIMathMatrixT<rows, cols, double> matr;
PIMathVectorT<rows, double> vect; PIMathVectorT<rows, double> vect;
vect.at(0) = 1.0; vect[0] = 1.0;
vect.at(1) = 3.0; vect[1] = 3.0;
vect.at(2) = 5.0; vect[2] = 5.0;
uint g = 1; uint g = 1;
matr.setRow(g, vect); matr.setRow(g, vect);
for(uint i = 0; i < vect.size(); i++) { for(uint i = 0; i < vect.size(); i++) {
if(matr.at(g,i) != vect.at(i)) { if(matr.element(g,i) != vect[i]) {
ASSERT_TRUE(false); ASSERT_TRUE(false);
} }
} }
@@ -138,15 +138,15 @@ TEST(PIMathMatrixT_Test, setRow) {
TEST(PIMathMatrixT_Test, swapCols) { TEST(PIMathMatrixT_Test, swapCols) {
PIMathMatrixT<rows, cols, double> matr; PIMathMatrixT<rows, cols, double> matr;
int g1 = 1, g2 = 2; int g1 = 1, g2 = 2;
matr.at(0,0) = 3; matr.element(0,0) = 3;
matr.at(0,1) = 6; matr.element(0,1) = 6;
matr.at(0,2) = 8; matr.element(0,2) = 8;
matr.at(1,0) = 2; matr.element(1,0) = 2;
matr.at(1,1) = 1; matr.element(1,1) = 1;
matr.at(1,2) = 4; matr.element(1,2) = 4;
matr.at(2,0) = 6; matr.element(2,0) = 6;
matr.at(2,1) = 2; matr.element(2,1) = 2;
matr.at(2,2) = 5; matr.element(2,2) = 5;
const PIMathVectorT<rows, double> before_Vect1 = matr.col(g1); const PIMathVectorT<rows, double> before_Vect1 = matr.col(g1);
const PIMathVectorT<rows, double> before_Vect2 = matr.col(g2); const PIMathVectorT<rows, double> before_Vect2 = matr.col(g2);
matr.swapCols(g1, g2); matr.swapCols(g1, g2);
@@ -163,15 +163,15 @@ TEST(PIMathMatrixT_Test, swapCols) {
TEST(PIMathMatrixT_Test, swapRows) { TEST(PIMathMatrixT_Test, swapRows) {
PIMathMatrixT<rows, cols, double> matr; PIMathMatrixT<rows, cols, double> matr;
int g1 = 1, g2 = 2; int g1 = 1, g2 = 2;
matr.at(0,0) = 3; matr.element(0,0) = 3;
matr.at(0,1) = 6; matr.element(0,1) = 6;
matr.at(0,2) = 8; matr.element(0,2) = 8;
matr.at(1,0) = 2; matr.element(1,0) = 2;
matr.at(1,1) = 1; matr.element(1,1) = 1;
matr.at(1,2) = 4; matr.element(1,2) = 4;
matr.at(2,0) = 6; matr.element(2,0) = 6;
matr.at(2,1) = 2; matr.element(2,1) = 2;
matr.at(2,2) = 5; matr.element(2,2) = 5;
const PIMathVectorT<rows, double> before_Vect1 = matr.row(g1); const PIMathVectorT<rows, double> before_Vect1 = matr.row(g1);
const PIMathVectorT<rows, double> before_Vect2 = matr.row(g2); const PIMathVectorT<rows, double> before_Vect2 = matr.row(g2);
matr.swapRows(g1, g2); matr.swapRows(g1, g2);
@@ -192,7 +192,7 @@ TEST(PIMathMatrixT_Test, fill) {
matr.fill(g); matr.fill(g);
for(uint i = 0; i < cols; i++) { for(uint i = 0; i < cols; i++) {
for(uint j = 0; j < rows; j++) { for(uint j = 0; j < rows; j++) {
matrix1.at(j,i) = g; matrix1.element(j,i) = g;
} }
} }
ASSERT_TRUE(matr == matrix1); ASSERT_TRUE(matr == matrix1);
@@ -215,7 +215,7 @@ TEST(PIMathMatrixT_Test, isIdentityTrue) {
} }
TEST(PIMathMatrixT_Test, isIdentityFalse) { TEST(PIMathMatrixT_Test, isIdentityFalse) {
auto matrix1 = PIMathMatrixT<rows, cols, double>::filled(2.5); auto matrix1 = PIMathMatrixT<rows, cols, double>(2.5);
ASSERT_FALSE(matrix1.isIdentity()); ASSERT_FALSE(matrix1.isIdentity());
} }
@@ -231,7 +231,7 @@ TEST(PIMathMatrixT_Test, isNullFalse) {
TEST(PIMathMatrixT_Test, operator_Assignment) { TEST(PIMathMatrixT_Test, operator_Assignment) {
PIMathMatrixT<rows, cols, double> matrix1; PIMathMatrixT<rows, cols, double> matrix1;
auto matrix2 = PIMathMatrixT<rows, cols, double>::filled(6.72); auto matrix2 = PIMathMatrixT<rows, cols, double>(6.72);
matrix1 = matrix2; matrix1 = matrix2;
ASSERT_TRUE(cmpSquareMatrixWithValue(matrix1, 6.72, rows)); ASSERT_TRUE(cmpSquareMatrixWithValue(matrix1, 6.72, rows));
} }
@@ -239,103 +239,103 @@ TEST(PIMathMatrixT_Test, operator_Assignment) {
TEST(PIMathMatrixT_Test, operator_EqualTrue) { TEST(PIMathMatrixT_Test, operator_EqualTrue) {
PIMathMatrixT<rows, cols, double> matrix1; PIMathMatrixT<rows, cols, double> matrix1;
PIMathMatrixT<rows, cols, double> matrix2; PIMathMatrixT<rows, cols, double> matrix2;
matrix1.at(0, 0) = 5.1; matrix1.element(0, 0) = 5.1;
matrix1.at(0, 1) = 1.21; matrix1.element(0, 1) = 1.21;
matrix1.at(1, 1) = 0.671; matrix1.element(1, 1) = 0.671;
matrix1.at(1, 0) = 2.623; matrix1.element(1, 0) = 2.623;
matrix2.at(0, 0) = 5.1; matrix2.element(0, 0) = 5.1;
matrix2.at(0, 1) = 1.21; matrix2.element(0, 1) = 1.21;
matrix2.at(1, 1) = 0.671; matrix2.element(1, 1) = 0.671;
matrix2.at(1, 0) = 2.623; matrix2.element(1, 0) = 2.623;
ASSERT_TRUE(matrix1 == matrix2); ASSERT_TRUE(matrix1 == matrix2);
} }
TEST(PIMathMatrixT_Test, operator_EqualFalse) { TEST(PIMathMatrixT_Test, operator_EqualFalse) {
PIMathMatrixT<rows, cols, double> matrix1; PIMathMatrixT<rows, cols, double> matrix1;
PIMathMatrixT<rows, cols, double> matrix2; PIMathMatrixT<rows, cols, double> matrix2;
matrix1.at(0, 0) = 5.1; matrix1.element(0, 0) = 5.1;
matrix1.at(0, 1) = 1.21; matrix1.element(0, 1) = 1.21;
matrix1.at(1, 1) = 0.671; matrix1.element(1, 1) = 0.671;
matrix1.at(1, 0) = 2.623; matrix1.element(1, 0) = 2.623;
matrix2.at(0, 0) = 5.1; matrix2.element(0, 0) = 5.1;
matrix2.at(0, 1) = 1.21; matrix2.element(0, 1) = 1.21;
matrix2.at(1, 1) = 665.671; matrix2.element(1, 1) = 665.671;
matrix2.at(1, 0) = 2.623; matrix2.element(1, 0) = 2.623;
ASSERT_FALSE(matrix1 == matrix2); ASSERT_FALSE(matrix1 == matrix2);
} }
TEST(PIMathMatrixT_Test, operator_Not_EqualTrue) { TEST(PIMathMatrixT_Test, operator_Not_EqualTrue) {
PIMathMatrixT<rows, cols, double> matrix1; PIMathMatrixT<rows, cols, double> matrix1;
PIMathMatrixT<rows, cols, double> matrix2; PIMathMatrixT<rows, cols, double> matrix2;
matrix1.at(0, 0) = 5.1; matrix1.element(0, 0) = 5.1;
matrix1.at(0, 1) = 1.21; matrix1.element(0, 1) = 1.21;
matrix1.at(1, 1) = 0.671; matrix1.element(1, 1) = 0.671;
matrix1.at(1, 0) = 2.623; matrix1.element(1, 0) = 2.623;
matrix2.at(0, 0) = 5.1; matrix2.element(0, 0) = 5.1;
matrix2.at(0, 1) = 1.21; matrix2.element(0, 1) = 1.21;
matrix2.at(1, 1) = 665.671; matrix2.element(1, 1) = 665.671;
matrix2.at(1, 0) = 2.623; matrix2.element(1, 0) = 2.623;
ASSERT_TRUE(matrix1 != matrix2); ASSERT_TRUE(matrix1 != matrix2);
} }
TEST(PIMathMatrixT_Test, operator_Not_EqualFalse) { TEST(PIMathMatrixT_Test, operator_Not_EqualFalse) {
PIMathMatrixT<rows, cols, double> matrix1; PIMathMatrixT<rows, cols, double> matrix1;
PIMathMatrixT<rows, cols, double> matrix2; PIMathMatrixT<rows, cols, double> matrix2;
matrix1.at(0, 0) = 5.1; matrix1.element(0, 0) = 5.1;
matrix1.at(0, 1) = 1.21; matrix1.element(0, 1) = 1.21;
matrix1.at(1, 1) = 0.671; matrix1.element(1, 1) = 0.671;
matrix1.at(1, 0) = 2.623; matrix1.element(1, 0) = 2.623;
matrix2.at(0, 0) = 5.1; matrix2.element(0, 0) = 5.1;
matrix2.at(0, 1) = 1.21; matrix2.element(0, 1) = 1.21;
matrix2.at(1, 1) = 0.671; matrix2.element(1, 1) = 0.671;
matrix2.at(1, 0) = 2.623; matrix2.element(1, 0) = 2.623;
ASSERT_FALSE(matrix1 != matrix2); ASSERT_FALSE(matrix1 != matrix2);
} }
TEST(PIMathMatrixT_Test, operator_Addition_Assignment) { TEST(PIMathMatrixT_Test, operator_Addition_Assignment) {
auto matrix1 = PIMathMatrixT<rows, cols, double>::filled(6.72) ; auto matrix1 = PIMathMatrixT<rows, cols, double>(6.72) ;
auto matrix2 = PIMathMatrixT<rows, cols, double>::filled(1.0) ; auto matrix2 = PIMathMatrixT<rows, cols, double>(1.0) ;
matrix1 += matrix2; matrix1 += matrix2;
ASSERT_TRUE(cmpSquareMatrixWithValue(matrix1, 7.72, rows)); ASSERT_TRUE(cmpSquareMatrixWithValue(matrix1, 7.72, rows));
} }
TEST(PIMathMatrixT_Test, operator_Subtraction_Assignment) { TEST(PIMathMatrixT_Test, operator_Subtraction_Assignment) {
auto matrix1 = PIMathMatrixT<rows, cols, double>::filled(1.0); auto matrix1 = PIMathMatrixT<rows, cols, double>(1.0);
auto matrix2 = PIMathMatrixT<rows, cols, double>::filled(6.72); auto matrix2 = PIMathMatrixT<rows, cols, double>(6.72);
matrix1 -= matrix2; matrix1 -= matrix2;
ASSERT_TRUE(cmpSquareMatrixWithValue(matrix1, -5.72, rows)); ASSERT_TRUE(cmpSquareMatrixWithValue(matrix1, -5.72, rows));
} }
TEST(PIMathMatrixT_Test, operator_Multiplication_Assignment) { TEST(PIMathMatrixT_Test, operator_Multiplication_Assignment) {
auto matrix1 = PIMathMatrixT<rows, cols, double>::filled(6.72); auto matrix1 = PIMathMatrixT<rows, cols, double>(6.72);
matrix1 *= 2.0; matrix1 *= 2.0;
ASSERT_TRUE(cmpSquareMatrixWithValue(matrix1, 13.44, rows)); ASSERT_TRUE(cmpSquareMatrixWithValue(matrix1, 13.44, rows));
} }
TEST(PIMathMatrixT_Test, operator_Division_Assignment) { TEST(PIMathMatrixT_Test, operator_Division_Assignment) {
auto matrix1 = PIMathMatrixT<rows, cols, double>::filled(6.72); auto matrix1 = PIMathMatrixT<rows, cols, double>(6.72);
matrix1 /= 2.0; matrix1 /= 2.0;
ASSERT_TRUE(cmpSquareMatrixWithValue(matrix1, 3.36, rows)); ASSERT_TRUE(cmpSquareMatrixWithValue(matrix1, 3.36, rows));
} }
TEST(PIMathMatrixT_Test, operator_Addition) { TEST(PIMathMatrixT_Test, operator_Addition) {
auto matrix1 = PIMathMatrixT<rows, cols, double>::filled(6.72); auto matrix1 = PIMathMatrixT<rows, cols, double>(6.72);
auto matrix2 = PIMathMatrixT<rows, cols, double>::filled(8.28); auto matrix2 = PIMathMatrixT<rows, cols, double>(8.28);
ASSERT_TRUE(cmpSquareMatrixWithValue(matrix1 + matrix2, 15.0, rows)); ASSERT_TRUE(cmpSquareMatrixWithValue(matrix1 + matrix2, 15.0, rows));
} }
TEST(PIMathMatrixT_Test, operator_Subtraction) { TEST(PIMathMatrixT_Test, operator_Subtraction) {
auto matrix1 = PIMathMatrixT<rows, cols, double>::filled(6.0); auto matrix1 = PIMathMatrixT<rows, cols, double>(6.0);
auto matrix2 = PIMathMatrixT<rows, cols, double>::filled(5.0); auto matrix2 = PIMathMatrixT<rows, cols, double>(5.0);
ASSERT_TRUE(cmpSquareMatrixWithValue(matrix1 - matrix2, 1.0, rows)); ASSERT_TRUE(cmpSquareMatrixWithValue(matrix1 - matrix2, 1.0, rows));
} }
TEST(PIMathMatrixT_Test, operator_Multiplication) { TEST(PIMathMatrixT_Test, operator_Multiplication) {
auto matrix1 = PIMathMatrixT<rows, cols, double>::filled(6.72); auto matrix1 = PIMathMatrixT<rows, cols, double>(6.72);
ASSERT_TRUE(cmpSquareMatrixWithValue(matrix1 * 4.0, 26.88, rows)); ASSERT_TRUE(cmpSquareMatrixWithValue(matrix1 * 4.0, 26.88, rows));
} }
TEST(PIMathMatrixT_Test, operator_Division) { TEST(PIMathMatrixT_Test, operator_Division) {
auto matrix1 = PIMathMatrixT<rows, cols, double>::filled(6.72); auto matrix1 = PIMathMatrixT<rows, cols, double>(6.72);
ASSERT_TRUE(cmpSquareMatrixWithValue(matrix1 / 4.0, 1.68, rows)); ASSERT_TRUE(cmpSquareMatrixWithValue(matrix1 / 4.0, 1.68, rows));
} }
@@ -343,30 +343,30 @@ TEST(PIMathMatrixT_Test, determinantIfSquare) {
double d; double d;
double i = 59.0; double i = 59.0;
PIMathMatrixT<rows, cols, double> matr; PIMathMatrixT<rows, cols, double> matr;
matr.at(0,0) = 3; matr.element(0,0) = 3;
matr.at(0,1) = 6; matr.element(0,1) = 6;
matr.at(0,2) = 8; matr.element(0,2) = 8;
matr.at(1,0) = 2; matr.element(1,0) = 2;
matr.at(1,1) = 1; matr.element(1,1) = 1;
matr.at(1,2) = 4; matr.element(1,2) = 4;
matr.at(2,0) = 6; matr.element(2,0) = 6;
matr.at(2,1) = 2; matr.element(2,1) = 2;
matr.at(2,2) = 5; matr.element(2,2) = 5;
d = matr.determinant(); d = matr.determinant();
ASSERT_DOUBLE_EQ(i, d); ASSERT_DOUBLE_EQ(i, d);
} }
TEST(PIMathMatrixT_Test, determinantIfNotSquare) { TEST(PIMathMatrixT_Test, determinantIfNotSquare) {
PIMathMatrixT<rows, 5u, double> matr; PIMathMatrixT<rows, 5u, double> matr;
matr.at(0,0) = 3; matr.element(0,0) = 3;
matr.at(0,1) = 6; matr.element(0,1) = 6;
matr.at(0,2) = 8; matr.element(0,2) = 8;
matr.at(1,0) = 2; matr.element(1,0) = 2;
matr.at(1,1) = 1; matr.element(1,1) = 1;
matr.at(1,2) = 4; matr.element(1,2) = 4;
matr.at(2,0) = 6; matr.element(2,0) = 6;
matr.at(2,1) = 2; matr.element(2,1) = 2;
matr.at(2,2) = 5; matr.element(2,2) = 5;
ASSERT_FALSE(matr.determinant()); ASSERT_FALSE(matr.determinant());
} }
@@ -376,15 +376,15 @@ TEST(PIMathMatrixT_Test, invert) {
PIMathMatrixT<rows, cols, double> matrix3; PIMathMatrixT<rows, cols, double> matrix3;
PIMathMatrixT<rows, cols, double> matr; PIMathMatrixT<rows, cols, double> matr;
double d1, d2; double d1, d2;
matr.at(0,0) = 3; matr.element(0,0) = 3;
matr.at(0,1) = 6; matr.element(0,1) = 6;
matr.at(0,2) = 8; matr.element(0,2) = 8;
matr.at(1,0) = 2; matr.element(1,0) = 2;
matr.at(1,1) = 1; matr.element(1,1) = 1;
matr.at(1,2) = 4; matr.element(1,2) = 4;
matr.at(2,0) = 6; matr.element(2,0) = 6;
matr.at(2,1) = 2; matr.element(2,1) = 2;
matr.at(2,2) = 5; matr.element(2,2) = 5;
matrix2 = matr; matrix2 = matr;
matr.invert(); matr.invert();
d1 = matr.determinant(); d1 = matr.determinant();
@@ -401,15 +401,15 @@ TEST(PIMathMatrixT_Test, inverted) {
PIMathMatrixT<rows, cols, double> matr; PIMathMatrixT<rows, cols, double> matr;
double d1, d2; double d1, d2;
matrix1 = matr.identity(); matrix1 = matr.identity();
matr.at(0,0) = 3; matr.element(0,0) = 3;
matr.at(0,1) = 6; matr.element(0,1) = 6;
matr.at(0,2) = 8; matr.element(0,2) = 8;
matr.at(1,0) = 2; matr.element(1,0) = 2;
matr.at(1,1) = 1; matr.element(1,1) = 1;
matr.at(1,2) = 4; matr.element(1,2) = 4;
matr.at(2,0) = 6; matr.element(2,0) = 6;
matr.at(2,1) = 2; matr.element(2,1) = 2;
matr.at(2,2) = 5; matr.element(2,2) = 5;
matrix2 = matr.inverted(); matrix2 = matr.inverted();
d1 = matr.determinant(); d1 = matr.determinant();
d2 = matrix2.determinant(); d2 = matrix2.determinant();
@@ -421,15 +421,15 @@ TEST(PIMathMatrixT_Test, toUpperTriangular) {
PIMathMatrixT<rows, cols, double> matrix; PIMathMatrixT<rows, cols, double> matrix;
double d1, d2 = 1; double d1, d2 = 1;
PIMathMatrixT<rows, cols, double> matr; PIMathMatrixT<rows, cols, double> matr;
matr.at(0,0) = 3; matr.element(0,0) = 3;
matr.at(0,1) = 6; matr.element(0,1) = 6;
matr.at(0,2) = 8; matr.element(0,2) = 8;
matr.at(1,0) = 2; matr.element(1,0) = 2;
matr.at(1,1) = 1; matr.element(1,1) = 1;
matr.at(1,2) = 4; matr.element(1,2) = 4;
matr.at(2,0) = 6; matr.element(2,0) = 6;
matr.at(2,1) = 2; matr.element(2,1) = 2;
matr.at(2,2) = 5; matr.element(2,2) = 5;
matrix = matr.toUpperTriangular(); matrix = matr.toUpperTriangular();
d1 = matrix.determinant(); d1 = matrix.determinant();
for(uint i = 0; i < cols; i++) for(uint i = 0; i < cols; i++)
@@ -444,15 +444,15 @@ TEST(PIMathMatrixT_Test, transposed) {
PIMathMatrixT<rows, cols, double> matrix2; PIMathMatrixT<rows, cols, double> matrix2;
PIMathMatrixT<rows, cols, double> matr; PIMathMatrixT<rows, cols, double> matr;
double d1, d2; double d1, d2;
matr.at(0,0) = 3; matr.element(0,0) = 3;
matr.at(0,1) = 6; matr.element(0,1) = 6;
matr.at(0,2) = 8; matr.element(0,2) = 8;
matr.at(1,0) = 2; matr.element(1,0) = 2;
matr.at(1,1) = 1; matr.element(1,1) = 1;
matr.at(1,2) = 4; matr.element(1,2) = 4;
matr.at(2,0) = 6; matr.element(2,0) = 6;
matr.at(2,1) = 2; matr.element(2,1) = 2;
matr.at(2,2) = 5; matr.element(2,2) = 5;
d1 = matr.determinant(); d1 = matr.determinant();
matrix1 = matr.transposed(); matrix1 = matr.transposed();
d2 = matrix1.determinant(); d2 = matrix1.determinant();
@@ -460,84 +460,25 @@ TEST(PIMathMatrixT_Test, transposed) {
ASSERT_TRUE((d1 == d2) && (matr == matrix2)); ASSERT_TRUE((d1 == d2) && (matr == matrix2));
} }
TEST(PIMathMatrixT_Test, scaleX_two) {
double factor = 5.64;
PIMathMatrixT<2u, 2u, double> matrix = PIMathMatrixT<2u, 2u, double>::scaleX(factor);
ASSERT_TRUE((1.0 == matrix.at(1u,1u)) && (factor == matrix.at(0u,0u)));
}
TEST(PIMathMatrixT_Test, scaleY_two) {
double factor = 5.64;
PIMathMatrixT<2u, 2u, double> matrix = PIMathMatrixT<2u, 2u, double>::scaleY(factor);
ASSERT_TRUE((factor == matrix.at(1u,1u)) && (1.0 == matrix.at(0u,0u)));
}
TEST(PIMathMatrixT_Test, rotation_2x2) { TEST(PIMathMatrixT_Test, rotation_2x2) {
double angle = 1.0; double angle = 1.0;
PIMathMatrixT<2u, 2u, double> matrix = PIMathMatrixT<2u, 2u, double>::rotation(angle); auto matrix = PIMathMatrixT<2u, 2u, double>::identity();
matrix.rotate(angle);
double c = cos(angle); double c = cos(angle);
double s = sin(angle); double s = sin(angle);
ASSERT_TRUE((c == matrix.at(1u,1u)) && (c == matrix.at(0u,0u)) && (-s == matrix.at(0u,1u)) && (s == matrix.at(1u,0u))); ASSERT_TRUE((c == matrix.at(1u,1u)) && (c == matrix.at(0u,0u)) && (-s == matrix.at(0u,1u)) && (s == matrix.at(1u,0u)));
} }
TEST(PIMathMatrixT_Test, rotation_3x3) {
double angle = 1.0;
PIMathMatrixT<3u, 3u, double> matrix = PIMathMatrixT<3u, 3u, double>::rotation(angle);
ASSERT_TRUE(cmpSquareMatrixWithValue(matrix, 0.0, rows));
}
TEST(PIMathMatrixT_Test, rotationX) {
double angle = 1.0;
double c = cos(angle);
double s = sin(angle);
PIMathMatrixT<3u, 3u, double> matrix = PIMathMatrixT<3u, 3u, double>::rotationX(angle);
ASSERT_TRUE((1.0 == matrix.at(0u,0u)) && (c == matrix.at(1u,1u)) && (c == matrix.at(2u,2u)) && (s == matrix.at(2u,1u)) && (-s == matrix.at(1u,2u)));
}
TEST(PIMathMatrixT_Test, rotationY) {
double angle = 1.0;
double c = cos(angle);
double s = sin(angle);
PIMathMatrixT<3u, 3u, double> matrix = PIMathMatrixT<3u, 3u, double>::rotationY(angle);
ASSERT_TRUE((1.0 == matrix.at(1u,1u)) && (c == matrix.at(0u,0u)) && (c == matrix.at(2u,2u)) && (s == matrix.at(0u,2u)) && (-s == matrix.at(2u,0u)));
}
TEST(PIMathMatrixT_Test, rotationZ) {
double angle = 1.0;
double c = cos(angle);
double s = sin(angle);
PIMathMatrixT<3u, 3u, double> matrix = PIMathMatrixT<3u, 3u, double>::rotationZ(angle);
ASSERT_TRUE((1.0 == matrix.at(2u,2u)) && (c == matrix.at(0u,0u)) && (c == matrix.at(1u,1u)) && (s == matrix.at(1u,0u)) && (-s == matrix.at(0u,1u)));
}
TEST(PIMathMatrixT_Test, scaleX_three) {
double factor = 23.65;
PIMathMatrixT<3u, 3u, double> matrix = PIMathMatrixT<3u, 3u, double>::scaleX(factor);
ASSERT_TRUE((1.0 == matrix.at(2u,2u)) && (factor == matrix.at(0u,0u)) && (1.0 == matrix.at(1u,1u)));
}
TEST(PIMathMatrixT_Test, scaleY_three) {
double factor = 23.65;
PIMathMatrixT<3u, 3u, double> matrix = PIMathMatrixT<3u, 3u, double>::scaleY(factor);
ASSERT_TRUE((1.0 == matrix.at(2u,2u)) && (1.0 == matrix.at(0u,0u)) && (factor == matrix.at(1u,1u)));
}
TEST(PIMathMatrixT_Test, scaleZ_three) {
double factor = 23.65;
PIMathMatrixT<3u, 3u, double> matrix = PIMathMatrixT<3u, 3u, double>::scaleZ(factor);
ASSERT_TRUE((factor == matrix.at(2u,2u)) && (1.0 == matrix.at(0u,0u)) && (1.0 == matrix.at(1u,1u)));
}
TEST(PIMathMatrixT_Test, matrixMultiplication) TEST(PIMathMatrixT_Test, matrixMultiplication)
{ {
auto matrix1 = PIMathMatrixT<rows, cols, double>::filled(1.5); auto matrix1 = PIMathMatrixT<rows, cols, double>(1.5);
auto matrix2 = PIMathMatrixT<rows, cols, double>::filled(2.5); auto matrix2 = PIMathMatrixT<rows, cols, double>(2.5);
ASSERT_TRUE(cmpSquareMatrixWithValue(matrix1 * matrix2, 11.25, 3)); ASSERT_TRUE(cmpSquareMatrixWithValue(matrix1 * matrix2, 11.25, 3));
} }
TEST(PIMathMatrixT_Test, matrixAndVectorMultiplication) { TEST(PIMathMatrixT_Test, matrixAndVectorMultiplication) {
auto matrix1 = PIMathMatrixT<rows, cols, double>::filled(1.5); auto matrix1 = PIMathMatrixT<rows, cols, double>(1.5);
auto vector = PIMathVectorT<rows, double>::filled(2.5); auto vector = PIMathVectorT<rows, double>(2.5);
for(uint i = 0; i < 2; i++) { for(uint i = 0; i < 2; i++) {
if((matrix1 * vector)[i] != 11.25) { if((matrix1 * vector)[i] != 11.25) {
ASSERT_TRUE(false); ASSERT_TRUE(false);
@@ -547,8 +488,8 @@ TEST(PIMathMatrixT_Test, matrixAndVectorMultiplication) {
} }
TEST(PIMathMatrixT_Test, vectorAndMatrixMultiplication) { TEST(PIMathMatrixT_Test, vectorAndMatrixMultiplication) {
auto matrix1 = PIMathMatrixT<rows, cols, double>::filled(1.5); auto matrix1 = PIMathMatrixT<rows, cols, double>(1.5);
auto vector = PIMathVectorT<rows, double>::filled(2.5); auto vector = PIMathVectorT<rows, double>(2.5);
for(uint i = 0; i < 2; i++) { for(uint i = 0; i < 2; i++) {
if((vector * matrix1)[i] != 11.25) { if((vector * matrix1)[i] != 11.25) {
ASSERT_TRUE(false); ASSERT_TRUE(false);
@@ -557,6 +498,6 @@ TEST(PIMathMatrixT_Test, vectorAndMatrixMultiplication) {
} }
TEST(PIMathMatrixT_Test, valAndMatrixMultiplication) { TEST(PIMathMatrixT_Test, valAndMatrixMultiplication) {
auto matrix1 = PIMathMatrixT<rows, cols, double>::filled(1.5); auto matrix1 = PIMathMatrixT<rows, cols, double>(1.5);
ASSERT_TRUE(cmpSquareMatrixWithValue(25.0*matrix1, 37.5, 3)); ASSERT_TRUE(cmpSquareMatrixWithValue(25.0*matrix1, 37.5, 3));
} }