isoron/gtsp
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix subtour cuts, create separate main functions

Browse Source
This commit is contained in:
Alinson S. Xavier
2015-03-24 10:00:45 -04:00
parent 75a016c8c2
commit 5fe42908b4
13 changed files with 886 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/draw_solution.sage
View File

@@ -56,9 +56,10 @@ for i in range(cluster_count):
for i in range(node_count):
(x,y,cluster) = [ int(float(x)) for x in raw_input().split(' ') ]
points[cluster].append((x,y))
all_points.append((x,y))
all_points.append(vector([x,y]))
# solutions file
(node_count, edge_count) = [ int(x) for x in raw_input().split(' ') ]
edges_count = int(raw_input())
edges = []
for i in range(edges_count):
@@ -67,6 +68,11 @@ for i in range(edges_count):
plot = list_plot([], xmax=100, xmin=0, ymax=100, ymin=0)
#plot = plot + sum([text(str(i), points[i]) for i in range(len(points))])
for i in range(node_count):
plot = plot + text(str(i), all_points[i] + vector([0,-2]), color='gray')
for i in range(cluster_count):
plot = plot + list_plot(points[i], color='gray', figsize=FIGURE_SIZE,
pointsize=POINT_SIZE)