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: Rename fields

Browse Source
This commit is contained in:
Alinson S. Xavier
2023-10-27 08:53:38 -05:00
parent c1adc0b79e
commit 7079a36203
14 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
miplearn/problems/tsp.py
View File

@@ -142,7 +142,7 @@ def build_tsp_model(data: Union[str, TravelingSalesmanData]) -> GurobiModel:
name="eq_degree",
)
def find_violations(model: GurobiModel) -> List[Any]:
def lazy_separate(model: GurobiModel) -> List[Any]:
violations = []
x = model.inner.cbGetSolution(model.inner._x)
selected_edges = [e for e in model.inner._edges if x[e] > 0.5]
@@ -159,7 +159,7 @@ def build_tsp_model(data: Union[str, TravelingSalesmanData]) -> GurobiModel:
violations.append(cut_edges)
return violations
def fix_violations(model: GurobiModel, violations: List[Any], where: str) -> None:
def lazy_enforce(model: GurobiModel, violations: List[Any], where: str) -> None:
for violation in violations:
constr = quicksum(model.inner._x[e[0], e[1]] for e in violation) >= 2
if where == "cb":
@@ -172,6 +172,6 @@ def build_tsp_model(data: Union[str, TravelingSalesmanData]) -> GurobiModel:
return GurobiModel(
model,
find_violations=find_violations,
fix_violations=fix_violations,
lazy_separate=lazy_separate,
lazy_enforce=lazy_enforce,
)