refactor: move solver choices to central place, enable hybrid

opencobra · Nov 19, 2023 · 792eb41 · 792eb41
1 parent 5b7dd5e
commit 792eb41
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/memote/suite/cli/callbacks.py b/src/memote/suite/cli/callbacks.py
@@ -31,6 +31,7 @@
 
 
 LOGGER = logging.getLogger(__name__)
+DEFAULT_SOLVERS = ("glpk", "cplex", "gurobi", "glpk_exact", "hybrid")
 
 
 def validate_collect(context, param, value):

diff --git a/src/memote/suite/cli/reports.py b/src/memote/suite/cli/reports.py
@@ -87,7 +87,7 @@ def report():
 )
 @click.option(
     "--solver",
-    type=click.Choice(["cplex", "glpk", "gurobi", "glpk_exact"]),
+    type=click.Choice(callbacks.DEFAULT_SOLVERS),
     default="glpk",
     show_default=True,
     help="Set the solver to be used.",
@@ -306,7 +306,7 @@ def _test_diff(
 )
 @click.option(
     "--solver",
-    type=click.Choice(["cplex", "glpk", "gurobi"]),
+    type=click.Choice(callbacks.DEFAULT_SOLVERS),
     default="glpk",
     show_default=True,
     help="Set the solver to be used.",

diff --git a/src/memote/suite/cli/runner.py b/src/memote/suite/cli/runner.py
@@ -129,7 +129,7 @@ def cli():
 )
 @click.option(
     "--solver",
-    type=click.Choice(["cplex", "glpk", "gurobi", "glpk_exact"]),
+    type=click.Choice(callbacks.DEFAULT_SOLVERS),
     default="glpk",
     show_default=True,
     help="Set the solver to be used.",
@@ -393,7 +393,7 @@ def _test_history(
 )
 @click.option(
     "--solver",
-    type=click.Choice(["cplex", "glpk", "gurobi"]),
+    type=click.Choice(callbacks.DEFAULT_SOLVERS),
     default="glpk",
     show_default=True,
     help="Set the solver to be used.",
Original file line number	Diff line number	Diff line change
Expand Up		@@ -31,6 +31,7 @@


		LOGGER = logging.getLogger(__name__)
		DEFAULT_SOLVERS = ("glpk", "cplex", "gurobi", "glpk_exact", "hybrid")


		def validate_collect(context, param, value):
Expand Down