Adds vertices neighborhood in voronoi; better cache handling

run_all.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 #encoding: utf-8
 
+import os
 import sys
 import turtle
 import argparse
@@ -50,13 +51,23 @@ parser.add_argument('-V', "--noplot-voronoi", help="Do not plot the Voronoï dia
 
 ask_for = parser.parse_args()
 
+def set_cache( filename, asked = None ):
+    fname = filename % ask_for.depth
+    if os.path.isfile(fname):
+        return fname
+    else:
+        return asked
+
 if ask_for.cache:
-    ask_for.penrose = "d%i_penrose.segments" % ask_for.depth
+    ask_for.penrose = set_cache( "d%i_penrose.segments", ask_for.penrose )
-    ask_for.triangulation = "d%i_triangulation.triangles" % ask_for.depth
+    ask_for.triangulation = set_cache("d%i_triangulation.triangles", ask_for.triangulation )
+    ask_for.tour = [set_cache("d%i_tour.points", ask_for.tour )]
+    if ask_for.tour != [None]:
         ask_for.notsp = True
-    ask_for.tour = ["d%i_tour.points" % ask_for.depth]
+    else:
-    ask_for.pheromones = "d%i_pheromones.mat" % ask_for.depth
+        ask_for.notsp = False
-    ask_for.voronoi = "d%i_voronoi.graph" % ask_for.depth
+    ask_for.pheromones = set_cache("d%i_pheromones.mat", ask_for.pheromones )
+    ask_for.voronoi = set_cache("d%i_voronoi.graph", ask_for.voronoi )
 
 
 error_codes = {"NOTSP":100}
@@ -211,12 +222,16 @@ if ask_for.voronoi:
 
 else:
     LOGN( "Compute the Voronoï diagram of the triangulation" )
-    voronoi_tri_graph = voronoi.dual(triangulated)
+    # Changing the neighborhood to be on vertices instead of edges will not compute the true Voronoï dual graph,
+    # but we want this graph to represent the relations on vertices of the tiles.
+    voronoi_tri_graph = voronoi.dual(triangulated, neighborhood = voronoi.vertices_neighbours)
     # voronoi_tri_edges   = graph.edges_of(voronoi_tri_graph)
     # voronoi_tri_centers = graph.nodes_of(voronoi_tri_graph)
 
     LOGN("\tMerge nodes that are both located within a single diamond" )
     LOG("\t\tMerge",len(voronoi_tri_graph),"nodes")
+    with open("d%i_voronoi_dual.graph" % depth, "w") as fd:
+        graph.write( voronoi_tri_graph, fd )
     voronoi_graph = voronoi.merge_enclosed( voronoi_tri_graph, penrose_segments )
     LOGN("as",len(voronoi_graph),"enclosed nodes")
 

voronoi.py

@@ -21,8 +21,8 @@ def edge_in( edge, edges ):
     return (n,m) in edges or (m,n) in edges
 
 
-def neighbours( candidate, polygons ):
+def edges_neighbours( candidate, polygons ):
-    """Returns the set of candidates in candidates that have an edge in common with the given candidate."""
+    """Returns the set of candidates in polygons that have an edge in common with the given candidate."""
     for polygon in polygons:
         if polygon == candidate:
             continue
@@ -42,8 +42,22 @@ def neighbours( candidate, polygons ):
                 yield polygon
                 break
 
+def vertices_neighbours( candidate, polygons ):
+    """Returns the set of candidates in polygon that have a vertex in common with the given candidate."""
+    for polygon in polygons:
+        if polygon == candidate:
+            continue
 
-def dual( triangles ):
+        for vertex in polygon:
+            # We use yield within the loop, because we want to test all the candidate vertex and
+            # return all the matching ones.
+            if vertex in candidate:
+                yield polygon
+                break
+
+
+
+def dual( triangles, neighborhood = edges_neighbours ):
     """Compute the dual Voronoï graph of a triangulation."""
     graph = {}
 
@@ -62,7 +76,7 @@ def dual( triangles ):
         current_node = triangulation.circumcircle(triangle)[0]
         assert( len(current_node) == 2 )
 
-        for neighbor_triangle in neighbours( triangle, triangles ):
+        for neighbor_triangle in neighborhood( triangle, triangles ):
             assert( len(triangle) == 3 )
             assert( not geometry.collinear(*neighbor_triangle) )
             assert( triangulation.is_acute(neighbor_triangle) )