Skip to content

Commit 7185c2e

Browse files
committed
Switch MINRES in eigenpy.solvers scope
1 parent c287874 commit 7185c2e

File tree

6 files changed

+5
-17
lines changed

6 files changed

+5
-17
lines changed

CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ set(${PROJECT_NAME}_SOLVERS_HEADERS
191191
include/eigenpy/solvers/IterativeSolverBase.hpp
192192
include/eigenpy/solvers/LeastSquaresConjugateGradient.hpp
193193
include/eigenpy/solvers/BiCGSTAB.hpp
194+
include/eigenpy/solvers/MINRES.hpp
194195
include/eigenpy/solvers/ConjugateGradient.hpp
195196
include/eigenpy/solvers/SparseSolverBase.hpp
196197
include/eigenpy/solvers/BasicPreconditioners.hpp
@@ -248,7 +249,6 @@ set(${PROJECT_NAME}_DECOMPOSITIONS_HEADERS
248249
include/eigenpy/decompositions/CompleteOrthogonalDecomposition.hpp
249250
include/eigenpy/decompositions/FullPivHouseholderQR.hpp
250251
include/eigenpy/decompositions/SelfAdjointEigenSolver.hpp
251-
include/eigenpy/decompositions/MINRES.hpp
252252
include/eigenpy/decompositions/SVDBase.hpp
253253
include/eigenpy/decompositions/BDCSVD.hpp
254254
include/eigenpy/decompositions/JacobiSVD.hpp)
@@ -335,7 +335,6 @@ set(${PROJECT_NAME}_DECOMPOSITIONS_SOURCES
335335
src/decompositions/tridiagonalization.cpp
336336
src/decompositions/real-schur.cpp
337337
src/decompositions/partialpivlu-solver.cpp
338-
src/decompositions/minres-solver.cpp
339338
src/decompositions/sparse-lu-solver.cpp
340339
src/decompositions/sparse-qr-solver.cpp
341340
src/decompositions/qr-solvers.cpp
File renamed without changes.

src/decompositions/decompositions.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ void exposeLDLTSolver();
2323
void exposeFullPivLUSolver();
2424
void exposePartialPivLUSolver();
2525
void exposeQRSolvers();
26-
void exposeMINRESSolver();
2726
void exposeSimplicialLLTSolver();
2827
void exposeSimplicialLDLTSolver();
2928
void exposeIncompleteCholesky();
@@ -52,7 +51,6 @@ void exposeDecompositions() {
5251
exposeFullPivLUSolver();
5352
exposePartialPivLUSolver();
5453
exposeQRSolvers();
55-
exposeMINRESSolver();
5654
exposeBDCSVDSolver();
5755
exposeJacobiSVDSolver();
5856

src/decompositions/minres-solver.cpp

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/solvers/solvers.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#endif
1515

1616
#include "eigenpy/solvers/BiCGSTAB.hpp"
17+
#include "eigenpy/solvers/MINRES.hpp"
1718

1819
namespace eigenpy {
1920
void exposeSolvers() {
@@ -54,6 +55,8 @@ void exposeSolvers() {
5455

5556
BiCGSTABVisitor<BiCGSTAB<MatrixXd>>::expose("BiCGSTAB");
5657
BiCGSTABVisitor<IdentityBiCGSTAB>::expose("IdentityBiCGSTAB");
58+
59+
MINRESSolverVisitor<MatrixXd>::expose("MINRES");
5760
}
5861
} // namespace eigenpy
5962

unittest/python/test_MINRES.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
rng = np.random.default_rng()
77
A = np.eye(dim)
88

9-
minres = eigenpy.MINRES(A)
9+
minres = eigenpy.solvers.MINRES(A)
1010

1111
X = rng.random((dim, 20))
1212
B = A.dot(X)

0 commit comments

Comments
 (0)