the repeated solves are already present in check_sparse_solving()

This commit is contained in:
Desire NUENTSA 2012-10-09 13:30:48 +02:00
parent f757034001
commit 77f92bf0b1
2 changed files with 7 additions and 11 deletions

View File

@ -26,8 +26,6 @@ template<typename T> void test_gmres_T()
void test_gmres() void test_gmres()
{ {
for(int i = 0; i < g_repeat; i++) { CALL_SUBTEST_1(test_gmres_T<double>());
CALL_SUBTEST_1(test_gmres_T<double>()); CALL_SUBTEST_2(test_gmres_T<std::complex<double> >());
CALL_SUBTEST_2(test_gmres_T<std::complex<double> >());
}
} }

View File

@ -13,21 +13,19 @@
template<typename T> void test_minres_T() template<typename T> void test_minres_T()
{ {
// MINRES<SparseMatrix<T>, Lower, DiagonalPreconditioner<T> > minres_colmajor_diag; MINRES<SparseMatrix<T>, Lower, DiagonalPreconditioner<T> > minres_colmajor_diag;
MINRES<SparseMatrix<T>, Lower, IdentityPreconditioner > minres_colmajor_I; MINRES<SparseMatrix<T>, Lower, IdentityPreconditioner > minres_colmajor_I;
// MINRES<SparseMatrix<T>, Lower, IncompleteLUT<T> > minres_colmajor_ilut; // MINRES<SparseMatrix<T>, Lower, IncompleteLUT<T> > minres_colmajor_ilut;
//minres<SparseMatrix<T>, SSORPreconditioner<T> > minres_colmajor_ssor; //minres<SparseMatrix<T>, SSORPreconditioner<T> > minres_colmajor_ssor;
// CALL_SUBTEST( check_sparse_square_solving(minres_colmajor_diag) ); CALL_SUBTEST( check_sparse_square_solving(minres_colmajor_diag) );
CALL_SUBTEST( check_sparse_spd_solving(minres_colmajor_I) ); CALL_SUBTEST( check_sparse_spd_solving(minres_colmajor_I) );
// CALL_SUBTEST( check_sparse_square_solving(minres_colmajor_ilut) ); // CALL_SUBTEST( check_sparse_square_solving(minres_colmajor_ilut) );
//CALL_SUBTEST( check_sparse_square_solving(minres_colmajor_ssor) ); //CALL_SUBTEST( check_sparse_square_solving(minres_colmajor_ssor) );
} }
void test_minres() void test_minres()
{ {
for(int i = 0; i < g_repeat; i++) { CALL_SUBTEST_1(test_minres_T<double>());
CALL_SUBTEST_1(test_minres_T<double>()); // CALL_SUBTEST_2(test_minres_T<std::complex<double> >());
// CALL_SUBTEST_2(test_minres_T<std::complex<double> >());
}
} }