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

Make extractor configurable

Browse Source
This commit is contained in:
Alinson S. Xavier
2021-04-15 09:57:10 -05:00
parent 95e326f5f6
commit 39597287a6
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
miplearn/solvers/learning.py
View File

@@ -99,9 +99,12 @@ class LearningSolver:
use_lazy_cb: bool = False,
solve_lp: bool = True,
simulate_perfect: bool = False,
extractor: Optional[FeaturesExtractor] = None,
) -> None:
if solver is None:
solver = GurobiPyomoSolver()
if extractor is None:
extractor = FeaturesExtractor()
assert isinstance(solver, InternalSolver)
self.components: Dict[str, Component] = {}
self.internal_solver: Optional[InternalSolver] = None
@@ -111,6 +114,7 @@ class LearningSolver:
self.solve_lp: bool = solve_lp
self.tee = False
self.use_lazy_cb: bool = use_lazy_cb
self.extractor = extractor
if components is not None:
for comp in components:
self._add_component(comp)
@@ -156,7 +160,7 @@ class LearningSolver:
# Extract features (after-load)
# -------------------------------------------------------
logger.info("Extracting features (after-load)...")
features = FeaturesExtractor(self.internal_solver).extract(instance)
features = self.extractor.extract(instance, self.internal_solver)
features.extra = {}
sample.after_load = features
@@ -187,8 +191,9 @@ class LearningSolver:
# Extract features (after-lp)
# -------------------------------------------------------
logger.info("Extracting features (after-lp)...")
features = FeaturesExtractor(self.internal_solver).extract(
features = self.extractor.extract(
instance,
self.internal_solver,
with_static=False,
)
features.extra = {}
@@ -252,8 +257,9 @@ class LearningSolver:
# Extract features (after-mip)
# -------------------------------------------------------
logger.info("Extracting features (after-mip)...")
features = FeaturesExtractor(self.internal_solver).extract(
features = self.extractor.extract(
instance,
self.internal_solver,
with_static=False,
)
features.mip_solve = mip_stats