diff --git a/src/TSP_solver.py b/src/TSP_solver.py index 2cb68d0..0396fdb 100644 --- a/src/TSP_solver.py +++ b/src/TSP_solver.py @@ -39,7 +39,7 @@ class Solver_TSP: def nn(self, instance_, starting_node=0): dist_matrix = np.copy(instance_.dist_matrix) n = int(instance_.nPoints) - node = np.argmin([starting_node]) + node = starting_node tour = [node] for _ in range(n - 1): for new_node in np.argsort(dist_matrix[node]): @@ -100,4 +100,4 @@ class Solver_TSP: def _gap(self): self.evaluate_solution(return_value=False) - self.gap = np.round((self.found_length - self.instance.best_sol) / self.instance.best_sol * 100, 2) + self.gap = np.round(((self.found_length - self.instance.best_sol) / self.instance.best_sol) * 100, 2) diff --git a/src/io_tsp.py b/src/io_tsp.py index 3dc8819..ffb111c 100644 --- a/src/io_tsp.py +++ b/src/io_tsp.py @@ -25,7 +25,7 @@ class Instance: # store data set information self.name = self.lines[0].split(' ')[2] self.nPoints = np.int(self.lines[3].split(' ')[2]) - self.best_sol = np.int(self.lines[5].split(' ')[2]) + self.best_sol = np.float(self.lines[5].split(' ')[2]) # read all data points and store them self.points = np.zeros((self.nPoints, 3))