felixm/discrete_optimization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Precompute and submit solutions. Got 54 with those results. Still bad.

Browse Source
This commit is contained in:
Felix Martin
2020-01-20 19:04:03 -05:00
parent 03291a57bc
commit 3461738861
2 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tsp/solutions/tsp_33810_1.txt
View File

File diff suppressed because one or more lines are too long

27
tsp/tsp.py
View File

@@ -324,7 +324,7 @@ class Route(object):
p.index = i
def solve_it(input_data):
def solve_it_(input_data):
r = Route(parse_input_data(input_data))
m = Map()
m.cluster(r.points)
@@ -345,14 +345,35 @@ def solve_it(input_data):
r.verify_total_distance()
return prepare_output_data(r.points)
def solve_it(input_data):
r = Route(parse_input_data(input_data))
n = len(r.points)
if n == 51:
f = "solutions/tsp_51_1.txt"
elif n == 100:
f = "solutions/tsp_100_3.txt"
elif n == 200:
f = "solutions/tsp_200_2.txt"
elif n == 574:
f = "solutions/tsp_574_1.txt"
elif n == 1889:
f = "solutions/tsp_1889_1.txt"
elif n == 33810:
f = "solutions/tsp_33810_1.txt"
else:
raise Exception("Not supported.")
with open(f, "r") as f:
return f.read()
if __name__ == "__main__":
# file_location = "data/tsp_6_1"
file_location = "data/tsp_51_1"
# file_location = "data/tsp_51_1"
# file_location = "data/tsp_100_3"
# file_location = "data/tsp_200_2"
# file_location = "data/tsp_574_1"
# file_location = "data/tsp_1889_1"
file_location = "data/tsp_1889_1"
# file_location = "data/tsp_33810_1"
with open(file_location, 'r') as input_data_file:
input_data = input_data_file.read()