Switch MINRES, IncompleteLUT and IncompleteCholesky in eigenpy.solvers scope

Author: Lucas-Haubert

CMakeLists.txt

@@ -191,10 +191,13 @@ set(${PROJECT_NAME}_SOLVERS_HEADERS
     include/eigenpy/solvers/IterativeSolverBase.hpp
     include/eigenpy/solvers/LeastSquaresConjugateGradient.hpp
     include/eigenpy/solvers/BiCGSTAB.hpp
+    include/eigenpy/solvers/MINRES.hpp
     include/eigenpy/solvers/ConjugateGradient.hpp
     include/eigenpy/solvers/SparseSolverBase.hpp
     include/eigenpy/solvers/BasicPreconditioners.hpp
-    include/eigenpy/solvers/BFGSPreconditioners.hpp)
+    include/eigenpy/solvers/BFGSPreconditioners.hpp
+    include/eigenpy/solvers/IncompleteCholesky.hpp
+    include/eigenpy/solvers/IncompleteLUT.hpp)
 
 set(${PROJECT_NAME}_EIGEN_HEADERS include/eigenpy/eigen/EigenBase.hpp)
 
@@ -213,9 +216,7 @@ set(${PROJECT_NAME}_DECOMPOSITIONS_SPARSE_HEADERS
     include/eigenpy/decompositions/sparse/LDLT.hpp
     include/eigenpy/decompositions/sparse/LU.hpp
     include/eigenpy/decompositions/sparse/SimplicialCholesky.hpp
-    include/eigenpy/decompositions/sparse/SparseSolverBase.hpp
-    include/eigenpy/decompositions/sparse/IncompleteCholesky.hpp
-    include/eigenpy/decompositions/sparse/IncompleteLUT.hpp)
+    include/eigenpy/decompositions/sparse/SparseSolverBase.hpp)
 
 if(BUILD_WITH_CHOLMOD_SUPPORT)
   list(APPEND ${PROJECT_NAME}_DECOMPOSITIONS_SPARSE_HEADERS
@@ -248,7 +249,6 @@ set(${PROJECT_NAME}_DECOMPOSITIONS_HEADERS
     include/eigenpy/decompositions/CompleteOrthogonalDecomposition.hpp
     include/eigenpy/decompositions/FullPivHouseholderQR.hpp
     include/eigenpy/decompositions/SelfAdjointEigenSolver.hpp
-    include/eigenpy/decompositions/MINRES.hpp
     include/eigenpy/decompositions/SVDBase.hpp
     include/eigenpy/decompositions/BDCSVD.hpp
     include/eigenpy/decompositions/JacobiSVD.hpp)
@@ -335,16 +335,13 @@ set(${PROJECT_NAME}_DECOMPOSITIONS_SOURCES
     src/decompositions/tridiagonalization.cpp
     src/decompositions/real-schur.cpp
     src/decompositions/partialpivlu-solver.cpp
-    src/decompositions/minres-solver.cpp
     src/decompositions/sparse-lu-solver.cpp
     src/decompositions/sparse-qr-solver.cpp
     src/decompositions/qr-solvers.cpp
     src/decompositions/self-adjoint-eigen-solver.cpp
     src/decompositions/permutation-matrix.cpp
     src/decompositions/simplicial-llt-solver.cpp
-    src/decompositions/simplicial-ldlt-solver.cpp
-    src/decompositions/incomplete-cholesky.cpp
-    src/decompositions/incomplete-lut.cpp)
+    src/decompositions/simplicial-ldlt-solver.cpp)
 
 if(BUILD_WITH_CHOLMOD_SUPPORT)
   list(APPEND ${PROJECT_NAME}_DECOMPOSITIONS_SOURCES

include/eigenpy/decompositions/sparse/IncompleteCholesky.hpp renamed to include/eigenpy/solvers/IncompleteCholesky.hpp

@@ -23,11 +23,8 @@ void exposeLDLTSolver();
 void exposeFullPivLUSolver();
 void exposePartialPivLUSolver();
 void exposeQRSolvers();
-void exposeMINRESSolver();
 void exposeSimplicialLLTSolver();
 void exposeSimplicialLDLTSolver();
-void exposeIncompleteCholesky();
-void exposeIncompleteLUT();
 void exposeSparseLUSolver();
 void exposeSparseQRSolver();
 void exposePermutationMatrix();
@@ -52,7 +49,6 @@ void exposeDecompositions() {
   exposeFullPivLUSolver();
   exposePartialPivLUSolver();
   exposeQRSolvers();
-  exposeMINRESSolver();
   exposeBDCSVDSolver();
   exposeJacobiSVDSolver();
 
@@ -74,8 +70,6 @@ void exposeDecompositions() {
   exposeSimplicialLDLTSolver();
   exposeSparseLUSolver();
   exposeSparseQRSolver();
-  exposeIncompleteCholesky();
-  exposeIncompleteLUT();
 
   exposePermutationMatrix();
 

include/eigenpy/decompositions/sparse/IncompleteLUT.hpp renamed to include/eigenpy/solvers/IncompleteLUT.hpp

@@ -14,6 +14,10 @@
 #endif
 
 #include "eigenpy/solvers/BiCGSTAB.hpp"
+#include "eigenpy/solvers/MINRES.hpp"
+
+#include "eigenpy/solvers/IncompleteLUT.hpp"
+#include "eigenpy/solvers/IncompleteCholesky.hpp"
 
 namespace eigenpy {
 void exposeSolvers() {
@@ -54,6 +58,12 @@ void exposeSolvers() {
 
   BiCGSTABVisitor<BiCGSTAB<MatrixXd>>::expose("BiCGSTAB");
   BiCGSTABVisitor<IdentityBiCGSTAB>::expose("IdentityBiCGSTAB");
+
+  MINRESSolverVisitor<MatrixXd>::expose("MINRES");
+
+  typedef SparseMatrix<double, ColMajor> ColMajorSparseMatrix;
+  IncompleteLUTVisitor<ColMajorSparseMatrix>::expose("IncompleteLUT");
+  IncompleteCholeskyVisitor<ColMajorSparseMatrix>::expose("IncompleteCholesky");
 }
 }  // namespace eigenpy
 

include/eigenpy/decompositions/MINRES.hpp renamed to include/eigenpy/solvers/MINRES.hpp

@@ -217,12 +217,10 @@ if(BUILD_TESTING_SCIPY)
   add_python_eigenpy_unit_test(
     "py-SimplicialLDLT"
     "unittest/python/decompositions/sparse/test_SimplicialLDLT.py")
-  add_python_eigenpy_unit_test(
-    "py-IncompleteCholesky"
-    "unittest/python/decompositions/sparse/test_IncompleteCholesky.py")
-  add_python_eigenpy_unit_test(
-    "py-IncompleteLUT"
-    "unittest/python/decompositions/sparse/test_IncompleteLUT.py")
+  add_python_eigenpy_unit_test("py-IncompleteCholesky"
+                               "unittest/python/test_IncompleteCholesky.py")
+  add_python_eigenpy_unit_test("py-IncompleteLUT"
+                               "unittest/python/test_IncompleteLUT.py")
   add_python_eigenpy_unit_test(
     "py-SparseLU" "unittest/python/decompositions/sparse/test_SparseLU.py")
   add_python_eigenpy_unit_test(