Remove sample.after_lp

This commit is contained in:
2021-07-01 12:25:50 -05:00
parent 4093ac62fd
commit b4a267a524
8 changed files with 95 additions and 78 deletions

View File

@@ -210,20 +210,13 @@ class LearningSolver:
# -------------------------------------------------------
logger.info("Extracting features (after-lp)...")
initial_time = time.time()
for (k, v) in lp_stats.__dict__.items():
sample.put(k, v)
self.extractor.extract_after_lp_features(self.internal_solver, sample)
features = self.extractor.extract(
instance,
self.internal_solver,
with_static=False,
)
logger.info(
"Features (after-lp) extracted in %.2f seconds"
% (time.time() - initial_time)
)
for (k, v) in lp_stats.__dict__.items():
sample.put(k, v)
features.lp_solve = lp_stats
sample.after_lp = features
# Callback wrappers
# -------------------------------------------------------
@@ -285,9 +278,9 @@ class LearningSolver:
# -------------------------------------------------------
logger.info("Extracting features (after-mip)...")
initial_time = time.time()
self.extractor.extract_after_mip_features(self.internal_solver, sample)
for (k, v) in mip_stats.__dict__.items():
sample.put(k, v)
self.extractor.extract_after_mip_features(self.internal_solver, sample)
logger.info(
"Features (after-mip) extracted in %.2f seconds"
% (time.time() - initial_time)