From 29dc605f6a9e806d8f562070459a8249a29b2096 Mon Sep 17 00:00:00 2001 From: UmbertoJr Date: Thu, 31 Oct 2019 15:49:48 +0100 Subject: [PATCH] solver --- code/TSP_solver.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/TSP_solver.py b/code/TSP_solver.py index baa67a6..56a5cd3 100644 --- a/code/TSP_solver.py +++ b/code/TSP_solver.py @@ -35,12 +35,13 @@ class Solver_TSP: def nn(self, instance_, starting_node=0): dist_matrix = np.copy(instance_.dist_matrix) n = int(instance_.nPoints) - dist_matrix[np.arange(n), np.arange(n)] = 1000 node = np.argmin([starting_node]) tour = [node] - for _ in range(n- 2): - node = np.argmin([node]) - tour.append(node) + for _ in range(n - 2): + for node in np.argsort(dist_matrix[node]): + if node not in tour: + tour.append(node) + tour.append(starting_node) self.solution = np.array(tour) self.solved = True return self.solution