Skip to content

Commit

Permalink
implement review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
cdiener authored and Midnighter committed Oct 31, 2023
1 parent d375ede commit d58bb70
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion release-notes/next-release.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## New features

* Adds a new "hybrid" solver that exposes an HIGHS/OSQP combinations for large scale
* Added a new "hybrid" solver that exposes an HIGHS/OSQP combinations for large scale
LPs, MILPs, and QPs.

## Fixes
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ install_requires =
httpx ~=0.24
importlib_resources
numpy >=1.13
optlang ~=1.5
optlang ~=1.8
pandas >=1.0,<3.0
pydantic >=1.6
python-libsbml ~=5.19
Expand Down
4 changes: 2 additions & 2 deletions src/cobra/util/solver.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
}

# Defines all the QP solvers implemented in optlang.
qp_solvers = ["cplex", "gurobi", "hybrid", "osqp"]
qp_solvers = ["cplex", "gurobi", "hybrid"]

# optlang solution statuses which still allow retrieving primal values
has_primals = [NUMERIC, FEASIBLE, INFEASIBLE, SUBOPTIMAL, ITERATION_LIMIT, TIME_LIMIT]
Expand Down Expand Up @@ -254,7 +254,7 @@ def get_solver_name(mip: bool = False, qp: bool = False) -> str:
# Those lists need to be updated as optlang implements more solvers
mip_order = ["gurobi", "cplex", "hybrid", "glpk"]
lp_order = ["glpk", "hybrid", "cplex", "gurobi"]
qp_order = ["cplex", "gurobi", "hybrid", "osqp"]
qp_order = ["cplex", "gurobi", "hybrid"]

if mip is False and qp is False:
for solver_name in lp_order:
Expand Down

0 comments on commit d58bb70

Please sign in to comment.