From 904ce6541353ad8596a430bb3b65bf131b4362a5 Mon Sep 17 00:00:00 2001 From: UmbertoJr Date: Mon, 4 Nov 2019 06:44:32 +0100 Subject: [PATCH] solver --- run.py | 1 + src/TSP_solver.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/run.py b/run.py index c5b31f7..50e9784 100644 --- a/run.py +++ b/run.py @@ -34,6 +34,7 @@ def run(show_plots=False): if instance.optimal_tour: solver.solution = np.concatenate([instance.optimal_tour, [instance.optimal_tour[0]]]) + solver.method = "optimal" solver.plot_solution() index = pd.MultiIndex.from_tuples(index, names=['problem', 'method']) diff --git a/src/TSP_solver.py b/src/TSP_solver.py index ee6c2c7..7e15cce 100644 --- a/src/TSP_solver.py +++ b/src/TSP_solver.py @@ -69,7 +69,7 @@ class Solver_TSP: assert self.solved, "You can't plot the solution, you need to solve it first!" plt.figure(figsize=(8, 8)) self._gap() - plt.title(f"{self.instance.name} solved with {self.method}, gap {self.gap}") + plt.title(f"{self.instance.name} solved with {self.method} solver, gap {self.gap}") ordered_points = self.instance.points[self.solution] plt.plot(ordered_points[:, 1], ordered_points[:, 2], 'b-') plt.show()