diff options
| -rw-r--r-- | Eigen/IterativeLinearSolvers | 1 | ||||
| -rw-r--r-- | Eigen/src/IterativeLinearSolvers/IncompleteCholesky.h (renamed from unsupported/Eigen/src/IterativeSolvers/IncompleteCholesky.h) | 0 | ||||
| -rw-r--r-- | test/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | test/incomplete_cholesky.cpp (renamed from unsupported/test/incomplete_cholesky.cpp) | 2 | ||||
| -rw-r--r-- | unsupported/Eigen/IterativeSolvers | 1 | ||||
| -rw-r--r-- | unsupported/test/CMakeLists.txt | 1 |
6 files changed, 3 insertions, 3 deletions
diff --git a/Eigen/IterativeLinearSolvers b/Eigen/IterativeLinearSolvers index f5fdcd9e5..027e537c6 100644 --- a/Eigen/IterativeLinearSolvers +++ b/Eigen/IterativeLinearSolvers @@ -34,6 +34,7 @@ #include "src/IterativeLinearSolvers/LeastSquareConjugateGradient.h" #include "src/IterativeLinearSolvers/BiCGSTAB.h" #include "src/IterativeLinearSolvers/IncompleteLUT.h" +#include "src/IterativeLinearSolvers/IncompleteCholesky.h" #include "src/Core/util/ReenableStupidWarnings.h" diff --git a/unsupported/Eigen/src/IterativeSolvers/IncompleteCholesky.h b/Eigen/src/IterativeLinearSolvers/IncompleteCholesky.h index 2cad1cec6..2cad1cec6 100644 --- a/unsupported/Eigen/src/IterativeSolvers/IncompleteCholesky.h +++ b/Eigen/src/IterativeLinearSolvers/IncompleteCholesky.h diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 767e82f21..9684c90e8 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -236,6 +236,7 @@ ei_add_test(sparse_solvers) ei_add_test(sparse_permutations) ei_add_test(simplicial_cholesky) ei_add_test(conjugate_gradient) +ei_add_test(incomplete_cholesky) ei_add_test(bicgstab) ei_add_test(lscg) ei_add_test(sparselu) diff --git a/unsupported/test/incomplete_cholesky.cpp b/test/incomplete_cholesky.cpp index cc2ed698e..435e2839a 100644 --- a/unsupported/test/incomplete_cholesky.cpp +++ b/test/incomplete_cholesky.cpp @@ -18,7 +18,7 @@ template<typename T, typename I> void test_incomplete_cholesky_T() ConjugateGradient<SparseMatrixType, Lower, IncompleteCholesky<T, Lower, AMDOrdering<I> > > cg_illt_lower_amd; ConjugateGradient<SparseMatrixType, Lower, IncompleteCholesky<T, Lower, NaturalOrdering<I> > > cg_illt_lower_nat; ConjugateGradient<SparseMatrixType, Upper, IncompleteCholesky<T, Upper, AMDOrdering<I> > > cg_illt_upper_amd; - ConjugateGradient<SparseMatrixType, Upper, IncompleteCholesky<T, Upper, AMDOrdering<I> > > cg_illt_upper_nat; + ConjugateGradient<SparseMatrixType, Upper, IncompleteCholesky<T, Upper, NaturalOrdering<I> > > cg_illt_upper_nat; CALL_SUBTEST( check_sparse_spd_solving(cg_illt_lower_amd) ); diff --git a/unsupported/Eigen/IterativeSolvers b/unsupported/Eigen/IterativeSolvers index ff0d59b6e..f0c017f00 100644 --- a/unsupported/Eigen/IterativeSolvers +++ b/unsupported/Eigen/IterativeSolvers @@ -33,7 +33,6 @@ #include "../../Eigen/Jacobi" #include "../../Eigen/Householder" #include "src/IterativeSolvers/GMRES.h" -#include "src/IterativeSolvers/IncompleteCholesky.h" //#include "src/IterativeSolvers/SSORPreconditioner.h" #include "src/IterativeSolvers/MINRES.h" diff --git a/unsupported/test/CMakeLists.txt b/unsupported/test/CMakeLists.txt index 79e70ced4..7a1737edd 100644 --- a/unsupported/test/CMakeLists.txt +++ b/unsupported/test/CMakeLists.txt @@ -91,7 +91,6 @@ endif() ei_add_test(polynomialsolver) ei_add_test(polynomialutils) ei_add_test(splines) -ei_add_test(incomplete_cholesky) ei_add_test(gmres) ei_add_test(minres) ei_add_test(levenberg_marquardt) |