From c253dc5f658afa922473d4f755bae01ef03312d4 Mon Sep 17 00:00:00 2001
From: Pete Shadbolt <pete.shadbolt@gmail.com>
Date: Thu, 10 Mar 2016 11:08:45 +0000
Subject: [PATCH] Decouple vizualization

---
 graph.py | 32 +++++---------------------------
 viz.py   | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 27 deletions(-)
 create mode 100644 viz.py

diff --git a/graph.py b/graph.py
index a0780cf..7ea22fd 100644
--- a/graph.py
+++ b/graph.py
@@ -1,13 +1,12 @@
-import networkx as nx
-from matplotlib import pyplot as plt
-
-vop_colors = ["red", "green", "blue"]
+"""
+Provides an extremely basic graph structure, based on neighbour lists
+"""
 
 def graph(n):
     """ Generate a graph with Hadamards on each qubit """
     graph = [set() for i in xrange(n)]
-    vops = [0 for i in xrange(n)]
-    return graph, vops # TODO: seems ugly
+    vops = [0 for i in xrange(n)] # TODO: seems ugly
+    return graph, vops 
 
 def add_edge(graph, v1, v2):
     """ Add an edge between two vertices in the graph """
@@ -37,24 +36,3 @@ def edgelist(graph):
             for n in v)
     return [tuple(e) for e in edges]
 
-def draw(graph, vops, filename="out.pdf", ns=500):
-    """ Draw a graph with networkx layout """
-    g = nx.from_edgelist(edgelist(graph))
-    pos = nx.spring_layout(g)
-    colors = [vop_colors[vop] for vop in vops]
-    nx.draw_networkx_nodes(g, pos, node_color="white", node_size=ns)
-    nx.draw_networkx_nodes(g, pos, node_color=colors, node_size=ns, alpha=.4)
-    nx.draw_networkx_labels(g, pos)
-    nx.draw_networkx_edges(g, pos)
-    plt.axis('off')
-    plt.savefig(filename)
-
-if __name__ == '__main__':
-    g, vops = graph(10)
-    add_edge(g, 0, 1)
-    add_edge(g, 1, 3)
-    add_edge(g, 3, 2)
-    add_edge(g, 3, 0)
-    add_edge(g, 2, 0)
-    edgelist(g)
-    draw(g, vops)
diff --git a/viz.py b/viz.py
new file mode 100644
index 0000000..5d35c68
--- /dev/null
+++ b/viz.py
@@ -0,0 +1,32 @@
+"""
+Utility function for plotting graphs nicely
+"""
+
+import networkx as nx
+from matplotlib import pyplot as plt
+from graph import *
+
+VOP_COLORS = ["red", "green", "blue"]
+
+def draw(graph, vops, filename="out.pdf", ns=500):
+    """ Draw a graph with networkx layout """
+    g = nx.from_edgelist(edgelist(graph))
+    pos = nx.spring_layout(g)
+    colors = [VOP_COLORS[vop] for vop in vops]
+    nx.draw_networkx_nodes(g, pos, node_color="white", node_size=ns)
+    nx.draw_networkx_nodes(g, pos, node_color=colors, node_size=ns, alpha=.4)
+    nx.draw_networkx_labels(g, pos)
+    nx.draw_networkx_edges(g, pos)
+    plt.axis('off')
+    plt.savefig(filename)
+
+if __name__ == '__main__':
+    g, vops = graph(10)
+    add_edge(g, 0, 1)
+    add_edge(g, 1, 3)
+    add_edge(g, 3, 2)
+    add_edge(g, 3, 0)
+    add_edge(g, 2, 0)
+    edgelist(g)
+    draw(g, vops)
+