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

Rename methods that use TrainingSample to _old

Browse Source
This commit is contained in:
Alinson S. Xavier
2021-04-11 21:00:04 -05:00
parent 5fd13981d4
commit 2da60dd293
13 changed files with 63 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
miplearn/solvers/learning.py
View File

@@ -162,7 +162,7 @@ class LearningSolver:
instance.features.__dict__ = features.__dict__
sample.after_load = features
callback_args = (
callback_args_old = (
self,
instance,
model,
@@ -177,7 +177,7 @@ class LearningSolver:
if self.solve_lp:
logger.debug("Running before_solve_lp callbacks...")
for component in self.components.values():
component.before_solve_lp(*callback_args)
component.before_solve_lp_old(*callback_args_old)
logger.info("Solving root LP relaxation...")
lp_stats = self.internal_solver.solve_lp(tee=tee)
@@ -188,7 +188,7 @@ class LearningSolver:
logger.debug("Running after_solve_lp callbacks...")
for component in self.components.values():
component.after_solve_lp(*callback_args)
component.after_solve_lp_old(*callback_args_old)
# Extract features (after-lp)
# -------------------------------------------------------
@@ -232,7 +232,7 @@ class LearningSolver:
# -------------------------------------------------------
logger.debug("Running before_solve_mip callbacks...")
for component in self.components.values():
component.before_solve_mip(*callback_args)
component.before_solve_mip_old(*callback_args_old)
# Solve MIP
# -------------------------------------------------------
@@ -269,7 +269,7 @@ class LearningSolver:
# -------------------------------------------------------
logger.debug("Calling after_solve_mip callbacks...")
for component in self.components.values():
component.after_solve_mip(*callback_args)
component.after_solve_mip_old(*callback_args_old)
# Flush
# -------------------------------------------------------