|
|
@@ -221,7 +221,7 @@ def beck_weathers(cities, opt):
|
|
|
# 1 = hill climbing, 2 = tabu/sideways allowed, 3 = random restarts, 4 = annealing
|
|
|
# x represents the optional parameters for 3 and 4
|
|
|
# specifically, the # of restarts and the annealing schedule, respectively
|
|
|
-def solver(problem, algo, *x):
|
|
|
+def solver(problem, algo, x=None):
|
|
|
# import map
|
|
|
prob = problem
|
|
|
with open(prob) as file:
|
|
|
@@ -467,7 +467,7 @@ def tenzing_norgay_graph():
|
|
|
def reinhold_messner_graph():
|
|
|
plt.ioff()
|
|
|
plt.switch_backend('agg')
|
|
|
- solution_time = []
|
|
|
+ solution_times = []
|
|
|
solution_scores = []
|
|
|
|
|
|
# num of cities
|
|
|
@@ -495,7 +495,7 @@ def reinhold_messner_graph():
|
|
|
runtime = 0
|
|
|
qual = 0
|
|
|
# run problem 100 times
|
|
|
- for j in range(0, 100):
|
|
|
+ for num in range(0, 100):
|
|
|
# path, cost, runtime returned
|
|
|
result = solver(filepath, 3, k)
|
|
|
runtime += result[2]
|
tarfeef101