ANL-CEEESA/MIPLearn
1
0
Fork 0
mirror of https://github.com/ANL-CEEESA/MIPLearn.git synced 2025-12-06 01:18:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Gurobi 9.5

Browse Source
This commit is contained in:
Alinson S. Xavier
2022-01-25 08:33:23 -06:00
parent 5075a3c2f2
commit ba8f5bb2f4
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -27,7 +27,7 @@ docs:
install-deps: install-deps:
$(PIP) install --upgrade pip $(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 xpress
$(PIP) install --upgrade -r requirements.txt $(PIP) install --upgrade -r requirements.txt

8
tests/components/test_dynamic_user_cuts.py
View File

@@ -53,13 +53,17 @@ class GurobiStableSetProblem(Instance):
@overrides @overrides
def enforce_user_cut( def enforce_user_cut(
self, self,
solver: InternalSolver, solver: GurobiSolver,
model: Any, model: Any,
cid: ConstraintName, cid: ConstraintName,
) -> Any: ) -> Any:
clique = [int(i) for i in cid.decode().split(",")] clique = [int(i) for i in cid.decode().split(",")]
x = model.getVars() 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 @pytest.fixture