Compare commits

2 Commits

Author SHA1 Message Date
Шишов Максим Денисович
0ce6afa43c bug fixes 2020-09-10 17:48:39 +03:00
Шишов Максим Денисович
5bec25a628 bug fixes 2020-09-10 17:48:16 +03:00
2 changed files with 19 additions and 19 deletions

View File

@@ -16,11 +16,6 @@ bool cmpSquareMatrixWithValue(PIMathMatrix<double> matrix, Type val, int num) {
TEST(PIMathMatrix_Test, identity) { TEST(PIMathMatrix_Test, identity) {
auto matrix = PIMathMatrix<double>::identity(3, 3); auto matrix = PIMathMatrix<double>::identity(3, 3);
for(int i = 0; i < 3; i++){
if(matrix[i][i] != 1.0){
ASSERT_TRUE(false);
}
}
for(int i = 0; i < 3; i++) { for(int i = 0; i < 3; i++) {
for(int j = 0; j < 3; j++) { for(int j = 0; j < 3; j++) {
if(i != j) { if(i != j) {
@@ -28,6 +23,11 @@ TEST(PIMathMatrix_Test, identity) {
ASSERT_TRUE(false); ASSERT_TRUE(false);
} }
} }
else {
if(matrix[i][i] != 1.0){
ASSERT_TRUE(false);
}
}
} }
} }
ASSERT_TRUE(true); ASSERT_TRUE(true);
@@ -35,11 +35,6 @@ TEST(PIMathMatrix_Test, identity) {
TEST(PIMathMatrixT_Test, element) { TEST(PIMathMatrixT_Test, element) {
auto matrix = PIMathMatrix<double>::identity(3, 3); auto matrix = PIMathMatrix<double>::identity(3, 3);
for(uint i = 0; i < 3; i++) {
if(matrix.element(i,i) != 1.0) {
ASSERT_TRUE(false);
}
}
for(int i = 0; i < 3; i++){ for(int i = 0; i < 3; i++){
for(int j = 0; j < 3; j++){ for(int j = 0; j < 3; j++){
if(i != j){ if(i != j){
@@ -47,6 +42,11 @@ TEST(PIMathMatrixT_Test, element) {
ASSERT_TRUE(false); ASSERT_TRUE(false);
} }
} }
else {
if(matrix.element(i,i) != 1.0) {
ASSERT_TRUE(false);
}
}
} }
} }
ASSERT_TRUE(true); ASSERT_TRUE(true);

View File

@@ -19,11 +19,6 @@ bool cmpSquareMatrixWithValue(PIMathMatrixT<rows, cols, double> matrix, Type val
TEST(PIMathMatrixT_Test, identity) { TEST(PIMathMatrixT_Test, identity) {
auto matrix = PIMathMatrixT<rows, cols, double>::identity(); auto matrix = PIMathMatrixT<rows, cols, double>::identity();
for(int i = 0; i < 3; i++){
if(matrix[i][i] != 1.0){
ASSERT_TRUE(false);
}
}
for(int i = 0; i < 3; i++){ for(int i = 0; i < 3; i++){
for(int j = 0; j < 3; j++){ for(int j = 0; j < 3; j++){
if(i != j){ if(i != j){
@@ -31,6 +26,11 @@ TEST(PIMathMatrixT_Test, identity) {
ASSERT_TRUE(false); ASSERT_TRUE(false);
} }
} }
else {
if(matrix[i][i] != 1.0){
ASSERT_TRUE(false);
}
}
} }
} }
ASSERT_TRUE(true); ASSERT_TRUE(true);
@@ -293,7 +293,7 @@ TEST(PIMathMatrixT_Test, operator_Not_EqualFalse) {
ASSERT_FALSE(matrix1 != matrix2); ASSERT_FALSE(matrix1 != matrix2);
} }
TEST(PIMathMatrixT_Test, operator_Addition_ ssignment) { TEST(PIMathMatrixT_Test, operator_Addition_Assignment) {
auto matrix1 = PIMathMatrixT<rows, cols, double>::filled(6.72) ; auto matrix1 = PIMathMatrixT<rows, cols, double>::filled(6.72) ;
auto matrix2 = PIMathMatrixT<rows, cols, double>::filled(1.0) ; auto matrix2 = PIMathMatrixT<rows, cols, double>::filled(1.0) ;
matrix1 += matrix2; matrix1 += matrix2;