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

Lazy: Simplify method signature; switch to AbstractModel

Browse Source
This commit is contained in:
Alinson S. Xavier
2023-10-27 09:14:51 -05:00
parent 7079a36203
commit a42cd5ae35
5 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
miplearn/problems/tsp.py
View File

@@ -159,13 +159,11 @@ def build_tsp_model(data: Union[str, TravelingSalesmanData]) -> GurobiModel:
violations.append(cut_edges)
return violations
def lazy_enforce(model: GurobiModel, violations: List[Any], where: str) -> None:
def lazy_enforce(model: GurobiModel, violations: List[Any]) -> None:
for violation in violations:
constr = quicksum(model.inner._x[e[0], e[1]] for e in violation) >= 2
if where == "cb":
model.inner.cbLazy(constr)
else:
model.inner.addConstr(constr)
model.add_constr(
quicksum(model.inner._x[e[0], e[1]] for e in violation) >= 2
)
logger.info(f"tsp: added {len(violations)} subtour elimination constraints")
model.update()