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

Rename before/after_solve to before/after_solve_mip

Browse Source
This commit is contained in:
Alinson S. Xavier
2021-03-30 09:00:02 -05:00
parent bcaf26b18c
commit 6ae052c8d0
15 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/components/steps/test_drop_redundant.py
View File

@@ -80,7 +80,7 @@ def test_drop_redundant():
component.classifiers = classifiers
# LearningSolver calls before_solve
component.before_solve(solver, instance, None)
component.before_solve_mip(solver, instance, None)
# Should query list of constraints
internal.get_constraint_ids.assert_called_once()
@@ -123,7 +123,7 @@ def test_drop_redundant():
# LearningSolver calls after_solve
training_data = {}
component.after_solve(solver, instance, None, {}, training_data)
component.after_solve_mip(solver, instance, None, {}, training_data)
# Should query slack for all inequalities
internal.get_inequality_slacks.assert_called_once()
@@ -147,7 +147,7 @@ def test_drop_redundant_with_check_feasibility():
component.classifiers = classifiers
# LearningSolver call before_solve
component.before_solve(solver, instance, None)
component.before_solve_mip(solver, instance, None)
# Assert constraints are extracted
assert internal.extract_constraint.call_count == 2

12
tests/components/test_composite.py
View File

@@ -22,14 +22,14 @@ def test_composite():
cc = CompositeComponent([c1, c2])
# Should broadcast before_solve
cc.before_solve(solver, instance, model)
c1.before_solve.assert_has_calls([call(solver, instance, model)])
c2.before_solve.assert_has_calls([call(solver, instance, model)])
cc.before_solve_mip(solver, instance, model)
c1.before_solve_mip.assert_has_calls([call(solver, instance, model)])
c2.before_solve_mip.assert_has_calls([call(solver, instance, model)])
# Should broadcast after_solve
cc.after_solve(solver, instance, model, {}, {})
c1.after_solve.assert_has_calls([call(solver, instance, model, {}, {})])
c2.after_solve.assert_has_calls([call(solver, instance, model, {}, {})])
cc.after_solve_mip(solver, instance, model, {}, {})
c1.after_solve_mip.assert_has_calls([call(solver, instance, model, {}, {})])
c2.after_solve_mip.assert_has_calls([call(solver, instance, model, {}, {})])
# Should broadcast fit
cc.fit([1, 2, 3])

2
tests/components/test_lazy_dynamic.py
View File

@@ -85,7 +85,7 @@ def test_lazy_before():
component.classifiers["a"].predict_proba = Mock(return_value=[[0.95, 0.05]])
component.classifiers["b"].predict_proba = Mock(return_value=[[0.02, 0.80]])
component.before_solve(solver, instances[0], models[0])
component.before_solve_mip(solver, instances[0], models[0])
# Should ask classifier likelihood of each constraint being violated
expected_x_test_a = np.array([[67.0, 21.75, 1287.92]])

2
tests/components/test_lazy_static.py
View File

@@ -68,7 +68,7 @@ def test_usage_with_solver():
)
# LearningSolver calls before_solve
component.before_solve(solver, instance, None)
component.before_solve_mip(solver, instance, None)
# Should ask if instance has static lazy constraints
instance.has_static_lazy_constraints.assert_called_once()