From ba8f5bb2f48fd8a7a9f9981dfdcb87ceed075ede Mon Sep 17 00:00:00 2001 From: "Alinson S. Xavier" Date: Tue, 25 Jan 2022 08:33:23 -0600 Subject: [PATCH] Upgrade to Gurobi 9.5 --- Makefile | 2 +- tests/components/test_dynamic_user_cuts.py | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 0fef914..f4dfcd8 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ docs: install-deps: $(PIP) install --upgrade pip - $(PIP) install --upgrade -i https://pypi.gurobi.com 'gurobipy>=9.1,<9.2' + $(PIP) install --upgrade -i https://pypi.gurobi.com 'gurobipy>=9.5,<9.6' $(PIP) install --upgrade xpress $(PIP) install --upgrade -r requirements.txt diff --git a/tests/components/test_dynamic_user_cuts.py b/tests/components/test_dynamic_user_cuts.py index 2bae1a6..57bbbd8 100644 --- a/tests/components/test_dynamic_user_cuts.py +++ b/tests/components/test_dynamic_user_cuts.py @@ -53,13 +53,17 @@ class GurobiStableSetProblem(Instance): @overrides def enforce_user_cut( self, - solver: InternalSolver, + solver: GurobiSolver, model: Any, cid: ConstraintName, ) -> Any: clique = [int(i) for i in cid.decode().split(",")] x = model.getVars() - model.addConstr(gp.quicksum([x[i] for i in clique]) <= 1) + constr = gp.quicksum([x[i] for i in clique]) <= 1 + if solver.cb_where: + model.cbCut(constr) + else: + model.addConstr(constr) @pytest.fixture