diff options
Diffstat (limited to 'test/simplicial_cholesky.cpp')
| -rw-r--r-- | test/simplicial_cholesky.cpp | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/test/simplicial_cholesky.cpp b/test/simplicial_cholesky.cpp index 786468421..649c817b4 100644 --- a/test/simplicial_cholesky.cpp +++ b/test/simplicial_cholesky.cpp @@ -9,16 +9,17 @@ #include "sparse_solver.h" -template<typename T> void test_simplicial_cholesky_T() +template<typename T, typename I> void test_simplicial_cholesky_T() { - SimplicialCholesky<SparseMatrix<T>, Lower> chol_colmajor_lower_amd; - SimplicialCholesky<SparseMatrix<T>, Upper> chol_colmajor_upper_amd; - SimplicialLLT<SparseMatrix<T>, Lower> llt_colmajor_lower_amd; - SimplicialLLT<SparseMatrix<T>, Upper> llt_colmajor_upper_amd; - SimplicialLDLT<SparseMatrix<T>, Lower> ldlt_colmajor_lower_amd; - SimplicialLDLT<SparseMatrix<T>, Upper> ldlt_colmajor_upper_amd; - SimplicialLDLT<SparseMatrix<T>, Lower, NaturalOrdering<int> > ldlt_colmajor_lower_nat; - SimplicialLDLT<SparseMatrix<T>, Upper, NaturalOrdering<int> > ldlt_colmajor_upper_nat; + typedef SparseMatrix<T,0,I> SparseMatrixType; + SimplicialCholesky<SparseMatrixType, Lower> chol_colmajor_lower_amd; + SimplicialCholesky<SparseMatrixType, Upper> chol_colmajor_upper_amd; + SimplicialLLT< SparseMatrixType, Lower> llt_colmajor_lower_amd; + SimplicialLLT< SparseMatrixType, Upper> llt_colmajor_upper_amd; + SimplicialLDLT< SparseMatrixType, Lower> ldlt_colmajor_lower_amd; + SimplicialLDLT< SparseMatrixType, Upper> ldlt_colmajor_upper_amd; + SimplicialLDLT< SparseMatrixType, Lower, NaturalOrdering<I> > ldlt_colmajor_lower_nat; + SimplicialLDLT< SparseMatrixType, Upper, NaturalOrdering<I> > ldlt_colmajor_upper_nat; check_sparse_spd_solving(chol_colmajor_lower_amd); check_sparse_spd_solving(chol_colmajor_upper_amd); @@ -34,12 +35,13 @@ template<typename T> void test_simplicial_cholesky_T() check_sparse_spd_determinant(ldlt_colmajor_lower_amd); check_sparse_spd_determinant(ldlt_colmajor_upper_amd); - check_sparse_spd_solving(ldlt_colmajor_lower_nat); - check_sparse_spd_solving(ldlt_colmajor_upper_nat); + check_sparse_spd_solving(ldlt_colmajor_lower_nat, 300, 1000); + check_sparse_spd_solving(ldlt_colmajor_upper_nat, 300, 1000); } void test_simplicial_cholesky() { - CALL_SUBTEST_1(test_simplicial_cholesky_T<double>()); - CALL_SUBTEST_2(test_simplicial_cholesky_T<std::complex<double> >()); + CALL_SUBTEST_1(( test_simplicial_cholesky_T<double,int>() )); + CALL_SUBTEST_2(( test_simplicial_cholesky_T<std::complex<double>, int>() )); + CALL_SUBTEST_3(( test_simplicial_cholesky_T<double,long int>() )); } |