Browse Source

added hardcoded arrays to hold NEOS results, removed 'n' as a const since it was not used

tarfeef101 6 years ago
parent
commit
313078e325
1 changed files with 4 additions and 3 deletions
  1. 4 3
      a2/tsp_local.py

+ 4 - 3
a2/tsp_local.py

@@ -5,8 +5,10 @@ from heapq import heappush, heappop
 from random import shuffle, sample, randint, SystemRandom
 import matplotlib.pyplot as plt
 
-distances = []
-n = 0
+neos14 = [318, 324, 336, 319, 351, 311, 272, 361, 274, 322]
+neos15 = [313, 318, 281, 324, 378, 291, 348, 342, 353, 325]
+neos16 = [404, 353, 361, 349, 358, 344, 373, 355, 243, 330]
+neos36 = 464
 
 # returns a shuffled version of the cities list while maintaining the first & last elements
 def rand_order(cities):
@@ -218,7 +220,6 @@ def solver(problem, algo, *x):
         prob = file.read().splitlines()
 
     global n
-    n = int(prob[0])
     cities = prob[1:]
     counter = 0
     # convert to list of list of ints