Add support for long indexes and for (real-valued) row-major matrices to CholmodSupport module

This commit is contained in:
Christoph Hertzberg
2016-12-19 14:07:42 +01:00
parent f5d644b415
commit 10c6bcdc2e
2 changed files with 84 additions and 29 deletions

View File

@@ -12,21 +12,21 @@
#include <Eigen/CholmodSupport>
template<typename T> void test_cholmod_T()
template<typename SparseType> void test_cholmod_ST()
{
CholmodDecomposition<SparseMatrix<T>, Lower> g_chol_colmajor_lower; g_chol_colmajor_lower.setMode(CholmodSupernodalLLt);
CholmodDecomposition<SparseMatrix<T>, Upper> g_chol_colmajor_upper; g_chol_colmajor_upper.setMode(CholmodSupernodalLLt);
CholmodDecomposition<SparseMatrix<T>, Lower> g_llt_colmajor_lower; g_llt_colmajor_lower.setMode(CholmodSimplicialLLt);
CholmodDecomposition<SparseMatrix<T>, Upper> g_llt_colmajor_upper; g_llt_colmajor_upper.setMode(CholmodSimplicialLLt);
CholmodDecomposition<SparseMatrix<T>, Lower> g_ldlt_colmajor_lower; g_ldlt_colmajor_lower.setMode(CholmodLDLt);
CholmodDecomposition<SparseMatrix<T>, Upper> g_ldlt_colmajor_upper; g_ldlt_colmajor_upper.setMode(CholmodLDLt);
CholmodDecomposition<SparseType, Lower> g_chol_colmajor_lower; g_chol_colmajor_lower.setMode(CholmodSupernodalLLt);
CholmodDecomposition<SparseType, Upper> g_chol_colmajor_upper; g_chol_colmajor_upper.setMode(CholmodSupernodalLLt);
CholmodDecomposition<SparseType, Lower> g_llt_colmajor_lower; g_llt_colmajor_lower.setMode(CholmodSimplicialLLt);
CholmodDecomposition<SparseType, Upper> g_llt_colmajor_upper; g_llt_colmajor_upper.setMode(CholmodSimplicialLLt);
CholmodDecomposition<SparseType, Lower> g_ldlt_colmajor_lower; g_ldlt_colmajor_lower.setMode(CholmodLDLt);
CholmodDecomposition<SparseType, Upper> g_ldlt_colmajor_upper; g_ldlt_colmajor_upper.setMode(CholmodLDLt);
CholmodSupernodalLLT<SparseMatrix<T>, Lower> chol_colmajor_lower;
CholmodSupernodalLLT<SparseMatrix<T>, Upper> chol_colmajor_upper;
CholmodSimplicialLLT<SparseMatrix<T>, Lower> llt_colmajor_lower;
CholmodSimplicialLLT<SparseMatrix<T>, Upper> llt_colmajor_upper;
CholmodSimplicialLDLT<SparseMatrix<T>, Lower> ldlt_colmajor_lower;
CholmodSimplicialLDLT<SparseMatrix<T>, Upper> ldlt_colmajor_upper;
CholmodSupernodalLLT<SparseType, Lower> chol_colmajor_lower;
CholmodSupernodalLLT<SparseType, Upper> chol_colmajor_upper;
CholmodSimplicialLLT<SparseType, Lower> llt_colmajor_lower;
CholmodSimplicialLLT<SparseType, Upper> llt_colmajor_upper;
CholmodSimplicialLDLT<SparseType, Lower> ldlt_colmajor_lower;
CholmodSimplicialLDLT<SparseType, Upper> ldlt_colmajor_upper;
check_sparse_spd_solving(g_chol_colmajor_lower);
check_sparse_spd_solving(g_chol_colmajor_upper);
@@ -50,8 +50,20 @@ template<typename T> void test_cholmod_T()
check_sparse_spd_determinant(ldlt_colmajor_upper);
}
template<typename T, int flags, typename IdxType> void test_cholmod_T()
{
test_cholmod_ST<SparseMatrix<T, flags, IdxType> >();
}
void test_cholmod_support()
{
CALL_SUBTEST_1(test_cholmod_T<double>());
CALL_SUBTEST_2(test_cholmod_T<std::complex<double> >());
CALL_SUBTEST_11( (test_cholmod_T<double , ColMajor, int >()) );
CALL_SUBTEST_12( (test_cholmod_T<double , ColMajor, long>()) );
CALL_SUBTEST_13( (test_cholmod_T<double , RowMajor, int >()) );
CALL_SUBTEST_14( (test_cholmod_T<double , RowMajor, long>()) );
CALL_SUBTEST_21( (test_cholmod_T<std::complex<double>, ColMajor, int >()) );
CALL_SUBTEST_22( (test_cholmod_T<std::complex<double>, ColMajor, long>()) );
// TODO complex row-major matrices do not work at the moment:
// CALL_SUBTEST_23( (test_cholmod_T<std::complex<double>, RowMajor, int >()) );
// CALL_SUBTEST_24( (test_cholmod_T<std::complex<double>, RowMajor, long>()) );
}