tests correction

This commit is contained in:
Шишов Максим Денисович
2020-09-10 10:52:09 +03:00
parent ab16bb3ce0
commit 98f77d90cd

View File

@@ -54,106 +54,66 @@ TEST(PIMathMatrix_Test, identity)
TEST(PIMathMatrix_Test, matrixRow) TEST(PIMathMatrix_Test, matrixRow)
{ {
PIMathMatrix<double> origMatr;
PIMathMatrix<double> matrix;
PIMathVector<double> vector; PIMathVector<double> vector;
uint i;
bool b;
vector.resize(3, 3.0); vector.resize(3, 3.0);
vector.fill(5.0); auto matrix = PIMathMatrix<double>::matrixRow(vector);
matrix = origMatr.matrixRow(vector); for(uint i = 0; i < vector.size(); i++)
for(i = 0; i < vector.size(); i++)
{ {
if(matrix[0][i] == 5.0) if(matrix[0][i] != 3.0)
{ {
b = true; ASSERT_TRUE(false);
}
else
{
b = false;
break;
} }
} }
ASSERT_TRUE(b); ASSERT_TRUE(true);
} }
TEST(PIMathMatrix_Test, matrixCol) TEST(PIMathMatrix_Test, matrixCol)
{ {
PIMathMatrix<double> origMatr;
PIMathMatrix<double> matrix;
PIMathVector<double> vector; PIMathVector<double> vector;
uint i;
bool b;
vector.resize(3, 3.0); vector.resize(3, 3.0);
vector.fill(5.0); auto matrix = PIMathMatrix<double>::matrixCol(vector);
matrix = origMatr.matrixCol(vector); for(uint i = 0; i < vector.size(); i++)
for(i = 0; i < vector.size(); i++)
{ {
if(matrix[i][0] == 5.0) if(matrix[i][0] != 3.0)
{ {
b = true; ASSERT_TRUE(false);
}
else
{
b = false;
break;
} }
} }
ASSERT_TRUE(b); ASSERT_TRUE(true);
} }
TEST(PIMathMatrix_Test, setCol) TEST(PIMathMatrix_Test, setCol)
{ {
PIMathMatrix<double> origMatr;
PIMathMatrix<double> matrix;
PIMathVector<double> vector; PIMathVector<double> vector;
uint i;
bool b;
vector.resize(3, 3.0); vector.resize(3, 3.0);
vector.fill(5.0); auto matrix = PIMathMatrix<double>::matrixCol(vector);
matrix = origMatr.matrixCol(vector);
vector.fill(10.0); vector.fill(10.0);
matrix.setCol(0, vector); matrix.setCol(0, vector);
for(i = 0; i < vector.size(); i++) for(uint i = 0; i < vector.size(); i++)
{ {
if(matrix[i][0] == 10.0) if(matrix[i][0] != 10.0)
{ {
b = true; ASSERT_TRUE(false);
}
else
{
b = false;
break;
} }
} }
ASSERT_TRUE(b); ASSERT_TRUE(true);
} }
TEST(PIMathMatrix_Test, setRow) TEST(PIMathMatrix_Test, setRow)
{ {
PIMathMatrix<double> origMatr;
PIMathMatrix<double> matrix;
PIMathVector<double> vector; PIMathVector<double> vector;
uint i;
bool b;
vector.resize(3, 3.0); vector.resize(3, 3.0);
vector.fill(5.0); auto matrix = PIMathMatrix<double>::matrixRow(vector);
matrix = origMatr.matrixRow(vector);
vector.fill(10.0); vector.fill(10.0);
matrix.setRow(0, vector); matrix.setRow(0, vector);
for(i = 0; i < vector.size(); i++) for(uint i = 0; i < vector.size(); i++)
{ {
if(matrix[0][i] == 10.0) if(matrix[0][i] != 10.0)
{ {
b = true; ASSERT_TRUE(false);
}
else
{
b = false;
break;
} }
} }
ASSERT_TRUE(b); ASSERT_TRUE(true);
} }
TEST(PIMathMatrix_Test, swapCols) TEST(PIMathMatrix_Test, swapCols)
@@ -758,4 +718,4 @@ TEST(PIMathMatrix_Test, transposed)
b = false; b = false;
} }
ASSERT_TRUE(b); ASSERT_TRUE(b);
} }