maggicl/AICup
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

pretest commit

Browse source
This commit is contained in:
Dario Mantegazza 2020-09-25 13:38:17 +02:00
parent dfd74836ed
commit 11f6a75f74
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/TSP_solver.py
View file

@ -3,7 +3,9 @@ from time import time as t
import numpy as np import numpy as np
import matplotlib.pyplot as plt import matplotlib.pyplot as plt
from src.local_search import TwoOpt_loop2opt, TwoDotFiveOpt_loop2dot5opt from src.two_opt import loop2opt
from src.two_dot_five_opt import loop2dot5opt
from src.simulated_annealing import sa
from src.constructive_algorithms import random_method, nearest_neighbor, best_nearest_neighbor, multi_fragment_mf from src.constructive_algorithms import random_method, nearest_neighbor, best_nearest_neighbor, multi_fragment_mf
@ -17,9 +19,9 @@ class SolverTSP:
"multi_fragment": multi_fragment_mf "multi_fragment": multi_fragment_mf
} }
available_improvements = {"2-opt": TwoOpt_loop2opt, available_improvements = {"2-opt": loop2opt,
"2.5-opt": TwoDotFiveOpt_loop2dot5opt, "2.5-opt": loop2dot5opt,
"simulated_annealing": Simulated_Annealing.sa} "simulated_annealing": sa}
# , # ,
# "simulated_annealing": Simulated_Annealing, # "simulated_annealing": Simulated_Annealing,