Commit 14e9364d authored by Administrator's avatar Administrator

[FIX] Adjacency matrix bug, url disappeared (maybe because of merge).

parent 7225844c
...@@ -133,7 +133,7 @@ def create_cooc(user=None, corpus=None, whitelist=None, size=150): ...@@ -133,7 +133,7 @@ def create_cooc(user=None, corpus=None, whitelist=None, size=150):
cursor.execute(query_cooc) cursor.execute(query_cooc)
return cooc return cooc
def get_cooc(request=None, corpus_id=None, cooc_id=None, type="node_link"): def get_cooc(request=None, corpus_id=None, cooc_id=None, type="node_link", n=150):
import pandas as pd import pandas as pd
from copy import copy from copy import copy
import numpy as np import numpy as np
...@@ -152,11 +152,6 @@ def get_cooc(request=None, corpus_id=None, cooc_id=None, type="node_link"): ...@@ -152,11 +152,6 @@ def get_cooc(request=None, corpus_id=None, cooc_id=None, type="node_link"):
if Node.objects.filter(type=type_cooc, parent=corpus).first() is None: if Node.objects.filter(type=type_cooc, parent=corpus).first() is None:
print("Coocurrences do not exist yet, create it.") print("Coocurrences do not exist yet, create it.")
if type == "node_link":
n = 150
elif type == "adjacency":
n = 50
whitelist = create_whitelist(request.user, corpus, size=n) whitelist = create_whitelist(request.user, corpus, size=n)
cooccurrence_node = create_cooc(user=request.user, corpus=corpus, whitelist=whitelist, size=n) cooccurrence_node = create_cooc(user=request.user, corpus=corpus, whitelist=whitelist, size=n)
print(cooccurrence_node.id, "Cooc created") print(cooccurrence_node.id, "Cooc created")
......
...@@ -35,7 +35,7 @@ urlpatterns = patterns('', ...@@ -35,7 +35,7 @@ urlpatterns = patterns('',
# Getting data # Getting data
url(r'^chart/corpus/(\d+)/data.csv$', views.send_csv), url(r'^chart/corpus/(\d+)/data.csv$', views.send_csv),
url(r'^corpus/(\d+)/node_link.json$', views.node_link), 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.node_link),
url(r'^api$', gargantext_web.api.Root), url(r'^api$', gargantext_web.api.Root),
url(r'^api/nodes/(\d+)/children/metadata$', gargantext_web.api.NodesChildrenMetatadata.as_view()), url(r'^api/nodes/(\d+)/children/metadata$', gargantext_web.api.NodesChildrenMetatadata.as_view()),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment