diff options
| author | Nao Pross <np@0hm.ch> | 2024-05-10 15:51:08 +0200 |
|---|---|---|
| committer | Nao Pross <np@0hm.ch> | 2024-05-10 15:51:08 +0200 |
| commit | c99f304114701ae7e9735bec775e4db18b77130a (patch) | |
| tree | 5e3974e2e4e0b3d5e6ac5fc0c272d118da125508 | |
| parent | Prepare structure for logdet canon (diff) | |
| download | sumofsquares-c99f304114701ae7e9735bec775e4db18b77130a.tar.gz sumofsquares-c99f304114701ae7e9735bec775e4db18b77130a.zip | |
Move cvxopt module into submodule for solvers
| -rw-r--r-- | sumofsquares/problems.py | 2 | ||||
| -rw-r--r-- | sumofsquares/solver/__init__.py | 3 | ||||
| -rw-r--r-- | sumofsquares/solver/cvxopt.py (renamed from sumofsquares/cvxopt.py) | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/sumofsquares/problems.py b/sumofsquares/problems.py index 309b13c..14a9cd9 100644 --- a/sumofsquares/problems.py +++ b/sumofsquares/problems.py @@ -19,7 +19,7 @@ from polymatrix.variable.abc import Variable from .abc import Problem, Constraint, Solver, Result from .constraints import NonNegative -from .cvxopt import solve_sos_cone as cvxopt_solve_sos_cone +from .solver.cvxopt import solve_sos_cone as cvxopt_solve_sos_cone from .utils import partition from .variable import OptVariable, from_name as opt_variable_from_name diff --git a/sumofsquares/solver/__init__.py b/sumofsquares/solver/__init__.py new file mode 100644 index 0000000..68a2090 --- /dev/null +++ b/sumofsquares/solver/__init__.py @@ -0,0 +1,3 @@ +""" +This module contains the interfaces to various solvers. +""" diff --git a/sumofsquares/cvxopt.py b/sumofsquares/solver/cvxopt.py index 6a1339f..0de8dea 100644 --- a/sumofsquares/cvxopt.py +++ b/sumofsquares/solver/cvxopt.py @@ -10,9 +10,9 @@ import polymatrix as poly from polymatrix.expression.expression import Expression from polymatrix.polymatrix.index import MonomialIndex, VariableIndex -from .abc import Problem, SolverInfo -from .constraints import NonNegative, EqualToZero, PositiveSemiDefinite, ExponentialCone -from .variable import OptVariable +from ..abc import Problem, SolverInfo +from ..constraints import NonNegative, EqualToZero, PositiveSemiDefinite, ExponentialCone +from ..variable import OptVariable class CVXOPTInfo(SolverInfo, UserDict): |