From c3402c666187c84bfd0e3ffe0e60b4673de072e2 Mon Sep 17 00:00:00 2001
From: Pete Shadbolt <pete.shadbolt@gmail.com>
Date: Thu, 10 Mar 2016 11:05:43 +0000
Subject: [PATCH] Test passing

---
 graph.py            |  2 +-
 tests/test_graph.py | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/graph.py b/graph.py
index 34188ad..a0780cf 100644
--- a/graph.py
+++ b/graph.py
@@ -7,7 +7,7 @@ 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
+    return graph, vops # TODO: seems ugly
 
 def add_edge(graph, v1, v2):
     """ Add an edge between two vertices in the graph """
diff --git a/tests/test_graph.py b/tests/test_graph.py
index 6167815..0f0e6f9 100644
--- a/tests/test_graph.py
+++ b/tests/test_graph.py
@@ -1,18 +1,18 @@
-from graph import Graph
+from graph import *
 
 def test_graph():
-    g = Graph(3)
-    g.add_edge(0,1)
-    g.add_edge(1,2)
-    g.add_edge(2,0)
-    assert g.neighbours[0]==set([1,2])
+    g, v = graph(3)
+    add_edge(g, 0,1)
+    add_edge(g, 1,2)
+    add_edge(g, 2,0)
+    assert g[0]==set([1,2])
 
-    g.del_edge(0,1)
-    assert g.neighbours[0]==set([2])
-    el = g.edgelist()
+    del_edge(g, 0,1)
+    assert g[0]==set([2])
+    el = edgelist(g)
     assert (1,2) in el
     assert not (0,1) in el
     assert len(el)==2
 
-    assert g.has_edge(1,2)
-    assert not g.has_edge(0,1)
+    assert has_edge(g, 1,2)
+    assert not has_edge(g, 0,1)