From 6a9f4f187c9c5fa8edec794247cac4eca1b86bcd Mon Sep 17 00:00:00 2001 From: UmbertoJr Date: Mon, 2 Dec 2019 08:26:52 +0100 Subject: [PATCH] solver --- run.py | 2 +- src/TSP_solver.py | 2 +- src/meta_heuristics.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/run.py b/run.py index ccbbcf5..7279436 100644 --- a/run.py +++ b/run.py @@ -4,7 +4,7 @@ import pandas as pd def run(show_plots=False, verbose=False): # names = [name_ for name_ in os.listdir("./problems") if "tsp" in name_] - names = ["eil76.tsp", "kroA100.tsp"] + names = ["eil76.tsp"] initializers = Solver_TSP.available_initializers.keys() improvements = Solver_TSP.available_improvements.keys() results = [] diff --git a/src/TSP_solver.py b/src/TSP_solver.py index b89d927..7364c3b 100644 --- a/src/TSP_solver.py +++ b/src/TSP_solver.py @@ -21,7 +21,7 @@ class Solver_TSP: available_improvements = {"2-opt": TwoOpt.loop2opt, "2.5-opt": TwoDotFiveOpt.loop2dot5opt, - "simulated_annealing": Simulated_Annealing.sm} + "simulated_annealing": Simulated_Annealing.sa} # , # "simulated_annealing": Simulated_Annealing, diff --git a/src/meta_heuristics.py b/src/meta_heuristics.py index ee000d1..fa7677d 100644 --- a/src/meta_heuristics.py +++ b/src/meta_heuristics.py @@ -1,5 +1,5 @@ import numpy as np - +import os if 'AI' in os.getcwd(): from src.utils import * else: