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

Cuts: Call set_cuts instead of setting cuts_aot_ directly

Browse Source
This commit is contained in:
Alinson S. Xavier
2024-02-01 10:18:24 -06:00
parent 281508f44c
commit 60c7222fbe
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
miplearn/components/cuts/mem.py
View File

@@ -110,5 +110,6 @@ class MemorizingCutsComponent(_BaseMemorizingConstrComponent):
if model.cuts_enforce is None: if model.cuts_enforce is None:
return return
assert self.constrs_ is not None assert self.constrs_ is not None
model.cuts_aot_ = self.predict("Predicting cutting planes...", test_h5) cuts = self.predict("Predicting cutting planes...", test_h5)
stats["Cuts: AOT"] = len(model.cuts_aot_) model.set_cuts(cuts)
stats["Cuts: AOT"] = len(cuts)

3
miplearn/solvers/abstract.py
View File

@@ -82,3 +82,6 @@ class AbstractModel(ABC):
@abstractmethod @abstractmethod
def write(self, filename: str) -> None: def write(self, filename: str) -> None:
pass pass
def set_cuts(self, cuts: List) -> None:
self.cuts_aot_ = cuts

8
tests/components/cuts/test_mem.py
View File

@@ -50,9 +50,11 @@ def test_mem_component_gp(
(x_test,) = clf.predict.call_args.args (x_test,) = clf.predict.call_args.args
assert x_test.shape == (1, 50) assert x_test.shape == (1, 50)
# Should set cuts_aot_ # Should call set_cuts
assert model.cuts_aot_ is not None model.set_cuts.assert_called()
assert len(model.cuts_aot_) == 256 (cuts_aot_,) = model.set_cuts.call_args.args
assert cuts_aot_ is not None
assert len(cuts_aot_) == 256
def test_usage_stab( def test_usage_stab(