Skip to content
Snippets Groups Projects
Commit b23981c8 authored by Lukas Cejka's avatar Lukas Cejka
Browse files

In SparseMatrixCopyTest.h: 

	Renamed different tested and copied matrices in the testCopyAssignment and testConversion functions.
parent 9c229a3a
No related branches found
No related tags found
1 merge request!16Matrices
Hide whitespace changes
Inline Side-by-side
src/UnitTests/Matrices/SparseMatrixCopyTest.h
+ 36
− 36
View file @ b23981c8
...@@ -340,57 +340,57 @@ void checkTriDiagMatrix( Matrix& m ) ...@@ -340,57 +340,57 @@ void checkTriDiagMatrix( Matrix& m )
template< typename Matrix1, typename Matrix2 > template< typename Matrix1, typename Matrix2 >
void testCopyAssignment() void testCopyAssignment()
{ {
// Matrix1 m1; Matrix1 triDiag1;
// setupTriDiagMatrix( m1 ); setupTriDiagMatrix( triDiag1 );
// checkTriDiagMatrix( m1 ); checkTriDiagMatrix( triDiag1 );
// Matrix1 m11; Matrix1 antiTriDiag1;
// setupAntiTriDiagMatrix( m11 ); setupAntiTriDiagMatrix( antiTriDiag1 );
// checkAntiTriDiagMatrix( m11 ); checkAntiTriDiagMatrix( antiTriDiag1 );
Matrix1 m111; Matrix1 unevenRowSize1;
setupUnevenRowSizeMatrix( m111 ); setupUnevenRowSizeMatrix( unevenRowSize1 );
checkUnevenRowSizeMatrix( m111 ); checkUnevenRowSizeMatrix( unevenRowSize1 );
// Matrix2 m2; Matrix2 triDiag2;
// m2 = m1; triDiag2 = triDiag1;
// checkTriDiagMatrix( m2 ); checkTriDiagMatrix( triDiag2 );
// Matrix2 m22; Matrix2 antiTriDiag2;
// m22 = m11; antiTriDiag2 = antiTriDiag1;
// checkAntiTriDiagMatrix( m22 ); checkAntiTriDiagMatrix( antiTriDiag2 );
Matrix2 m222; Matrix2 unevenRowSize2;
m222 = m111; unevenRowSize2 = unevenRowSize1;
checkUnevenRowSizeMatrix( m222 ); checkUnevenRowSizeMatrix( unevenRowSize2 );
} }
template< typename Matrix1, typename Matrix2 > template< typename Matrix1, typename Matrix2 >
void testConversion() void testConversion()
{ {
// Matrix1 m1; Matrix1 triDiag1;
// setupTriDiagMatrix( m1 ); setupTriDiagMatrix( triDiag1 );
// checkTriDiagMatrix( m1 ); checkTriDiagMatrix( triDiag1 );
// Matrix1 m11; Matrix1 antiTriDiag1;
// setupAntiTriDiagMatrix( m11 ); setupAntiTriDiagMatrix( antiTriDiag1 );
// checkAntiTriDiagMatrix( m11 ); checkAntiTriDiagMatrix( antiTriDiag1 );
Matrix1 m111; Matrix1 unevenRowSize1;
setupUnevenRowSizeMatrix( m111 ); setupUnevenRowSizeMatrix( unevenRowSize1 );
checkUnevenRowSizeMatrix( m111 ); checkUnevenRowSizeMatrix( unevenRowSize1 );
// Matrix2 m2; Matrix2 triDiag2;
// TNL::Matrices::copySparseMatrix( m2, m1 ); TNL::Matrices::copySparseMatrix( triDiag2, triDiag1 );
// checkTriDiagMatrix( m2 ); checkTriDiagMatrix( triDiag2 );
// Matrix2 m22; Matrix2 antiTriDiag2;
// TNL::Matrices::copySparseMatrix( m22, m11 ); TNL::Matrices::copySparseMatrix( antiTriDiag2, antiTriDiag1 );
// checkAntiTriDiagMatrix( m22 ); checkAntiTriDiagMatrix( antiTriDiag2 );
Matrix2 m222; Matrix2 unevenRowSize2;
TNL::Matrices::copySparseMatrix( m222, m111 ); TNL::Matrices::copySparseMatrix( unevenRowSize2, unevenRowSize1 );
checkUnevenRowSizeMatrix( m222 ); checkUnevenRowSizeMatrix( unevenRowSize2 );
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment