tidy up

Author: Mark Needham

generate_notebook.py

@@ -142,10 +142,12 @@ def find_tag(file, tag):
 from IPython.core.display import display, HTML, Javascript
 from string import Template
 import json
+from scripts.algo import viz_config, render_image
 
-query = "MATCH (p1:Page)-[r:LINKS]->(p2:Page) RETURN *"
-labels_json = {'Page': {'caption': 'name', 'size': 'pagerank'}}
-relationships_json = {'LINKS': {'thickness': 'weight', 'caption': False}}
+config = viz_config("%s")
+query = config["query"]
+labels_json = config["labels_json"]
+relationships_json = config["relationships_json"]
 
 json_graph = {
     "query": query,
@@ -156,7 +158,7 @@ def find_tag(file, tag):
     "password": password
 }
 
-Javascript("""window.jsonGraph={};""".format(json.dumps(json_graph)))'''
+Javascript("""window.jsonGraph={};""".format(json.dumps(json_graph)))''' % algorithm_name
 
 neo_vis_div_cell = '''\
 %%html
@@ -204,7 +206,7 @@ def find_tag(file, tag):
       var cell_element = output_area.element.parents('.cell');
       var cell_idx = Jupyter.notebook.get_cell_elements().index(cell_element);
       var cell = Jupyter.notebook.get_cell(cell_idx+1);
-      cell.set_text("HTML('<img id=\\"viz-image\\" width=\\"300px\\" src=\\"%s\\" />' % image_src)")
+      cell.set_text("render_image(image_src)")
       cell.execute();
     });
 });'''

notebooks/PageRank.ipynb

@@ -0,0 +1,15 @@
+from IPython.core.display import HTML
+
+
+def viz_config(algorithm_name):
+    return {
+        "Page Rank": {
+            "query": "MATCH (p1:Page)-[r:LINKS]->(p2:Page) RETURN *",
+            "labels_json": {'Page': {'caption': 'name', 'size': 'pagerank'}},
+            "relationships_json": {'LINKS': {'thickness': 'weight', 'caption': False}}
+        }
+    }[algorithm_name]
+
+
+def render_image(image_src):
+    return HTML('<img id="viz-image" width="300px" src="%s" />' % image_src)