[FEATURE] Adding adjacency matrix (need to adapt json).

analysis/functions.py

@@ -133,7 +133,7 @@ def create_cooc(user=None, corpus=None, whitelist=None, size=200):
     cursor.execute(query_cooc)
     return cooc
 
-def get_cooc(request=None, corpus_id=None, type="node_link"):
+def get_cooc(request=None, corpus_id=None, cooc_id=None, type="node_link"):
     import pandas as pd
     from copy import copy
     import numpy as np
@@ -192,13 +192,19 @@ def get_cooc(request=None, corpus_id=None, type="node_link"):
     for node in G.nodes():
         try:
             #node,type(labels[node])
-            G.node[node]['label'] = node
-            G.node[node]['size'] = weight[node]
+            G.node[node]['label']   = node
+            G.node[node]['name']    = node
+            G.node[node]['size']    = weight[node]
+            G.node[node]['group']   = partition[node]
 #            G.node[node]['color'] = '19,180,300'
+            G.add_edge(node, partition[node], weight=2)
         except Exception as error:
             print(error)
     
-    data = json_graph.node_link_data(G)
+    if type == "node_link":
+        data = json_graph.node_link_data(G)
+    elif type == "adjacency":
+        data = json_graph.adjacency_data(G)
 #    data = json_graph.node_link_data(G, attrs={\
 #            'source':'source',\
 #            'target':'target',\

gargantext_web/urls.py

@@ -11,12 +11,13 @@ import gargantext_web.api
 admin.autodiscover()
 
 urlpatterns = patterns('',
-    # url(r'^$', 'gargantext_web.views.home', name='home'),
-    # url(r'^blog/', include('blog.urls')),
+    
+    # Admin views
     url(r'^admin/', include(admin.site.urls)),
     url(r'^login/', include(admin.site.urls)),
     url(r'^grappelli/', include('grappelli.urls')),
     
+    # User views
     url(r'^$', views.home),
     
     url(r'^projects/$', views.projects),
@@ -27,21 +28,22 @@ urlpatterns = patterns('',
     url(r'^project/(\d+)/corpus/(\d+)/$', views.corpus),
     url(r'^project/(\d+)/corpus/(\d+)/delete/$', views.delete_corpus),
     
+    # Visualizations
     url(r'^corpus/(\d+)/explorer$', views.explorer_graph),
-    url(r'^chart$', views.explorer_chart),
-    url(r'^matrix$', views.explorer_matrix),
+    url(r'^corpus/(\d+)/matrix$', views.explorer_matrix),
     
-    #url(r'^exploration$', views.exploration),
-
+    # Getting data
     url(r'^chart/corpus/(\d+)/data.csv$', views.send_csv),
     url(r'^corpus/(\d+)/node_link.json$', views.node_link),
-    url(r'^corpus/(\d+)/adjancy_matrix$', views.node_link),
-
+    url(r'^corpus/(\d+)/adjacency.json$', views.adjacency),
+    
+    # REST views
     url(r'^api/nodes$', gargantext_web.api.NodesController.get),
     url(r'^api/corpus/(\d+)/ngrams$', gargantext_web.api.CorpusController.ngrams),
     url(r'^api/corpus/(\d+)/metadata$', gargantext_web.api.CorpusController.metadata),
     url(r'^api/corpus/(\d+)/data$', gargantext_web.api.CorpusController.data),
-
+    
+    # Tests (to be removed soon)
     url(r'^graph-it$', views.graph_it),
     url(r'^ngrams$', views.ngrams),
 )

gargantext_web/views.py

@@ -26,7 +26,6 @@ from collections import defaultdict
 
 from parsing.FileParsers import *
 
-
 # SOME FUNCTIONS
 
 def query_to_dicts(query_string, *query_args):
@@ -391,14 +390,16 @@ def explorer_graph(request, corpus_id):
     
     return HttpResponse(html)
 
-def explorer_matrix(request):
+def explorer_matrix(request, corpus_id):
     t = get_template('matrix.html')
     user = request.user
     date = datetime.datetime.now()
+    corpus = Node.objects.get(id=corpus_id)
 
     html = t.render(Context({\
             'user': user,\
             'date': date,\
+            'corpus': corpus,\
             }))
     
     return HttpResponse(html)
@@ -470,16 +471,30 @@ def send_csv(request, corpus_id):
 
     return response
 
+
+
+# To get the data
+from gargantext_web.api import JsonHttpResponse
+from analysis.functions import get_cooc
+
+
 def node_link(request, corpus_id):
     '''
-    Create the HttpResponse object with the graph dataset.
+    Create the HttpResponse object with the node_link dataset.
     '''
 
-    from gargantext_web.api import JsonHttpResponse
-    from analysis.functions import get_cooc
+   
     data = get_cooc(request=request, corpus_id=corpus_id, type="node_link")
     return JsonHttpResponse(data)
 
+def adjacency(request, corpus_id):
+    '''
+    Create the HttpResponse object with the adjacency dataset.
+    '''
+    data = get_cooc(request=request, corpus_id=corpus_id, type="adjacency")
+    return JsonHttpResponse(data)
+
+
 def graph_it(request):
     '''The new multimodal graph.'''
     t = get_template('graph-it.html')

templates/matrix.html

@@ -43,7 +43,7 @@ var svg = d3.select("body").append("svg")
   .append("g")
     .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
 
-		d3.json("{% static "img/miserables.json" %}, function(miserables) {
+		d3.json("localhost:8000/corpus/{{ corpus.id }}/node_link.json", function(miserables) {
   var matrix = [],
       nodes = miserables.nodes,
       n = nodes.length;