Change LearningSolver.solve and fit

This commit is contained in:
2022-02-22 15:21:56 -06:00
parent c98ff4eab4
commit 522f3a7e18
10 changed files with 157 additions and 107 deletions

View File

@@ -36,4 +36,4 @@ def test_knapsack() -> None:
weights=data[0].weights,
)
solver = LearningSolver()
solver.solve(instance)
solver._solve(instance)

View File

@@ -15,7 +15,7 @@ def test_stab() -> None:
weights = np.array([1.0, 1.0, 1.0, 1.0, 1.0])
instance = MaxWeightStableSetInstance(graph, weights)
solver = LearningSolver()
stats = solver.solve(instance)
stats = solver._solve(instance)
assert stats["mip_lower_bound"] == 2.0

View File

@@ -40,7 +40,7 @@ def test_instance() -> None:
)
instance = TravelingSalesmanInstance(n_cities, distances)
solver = LearningSolver()
solver.solve(instance)
solver._solve(instance)
assert len(instance.get_samples()) == 1
sample = instance.get_samples()[0]
assert_equals(sample.get_array("mip_var_values"), [1.0, 0.0, 1.0, 1.0, 0.0, 1.0])
@@ -63,7 +63,7 @@ def test_subtour() -> None:
distances = squareform(pdist(cities))
instance = TravelingSalesmanInstance(n_cities, distances)
solver = LearningSolver()
solver.solve(instance)
solver._solve(instance)
samples = instance.get_samples()
assert len(samples) == 1
sample = samples[0]
@@ -96,5 +96,5 @@ def test_subtour() -> None:
1.0,
],
)
solver.fit([instance])
solver.solve(instance)
solver._fit([instance])
solver._solve(instance)