[FIX] fix conflicts.

admin/utils.py

@@ -28,3 +28,4 @@ def PrintException():
     line = linecache.getline(filename, lineno, f.f_globals)
     print('EXCEPTION IN ({}, LINE {} "{}"): {}'.format(filename, lineno, line.strip(), exc_obj))
 
+

analysis/functions.py

@@ -236,21 +236,23 @@ def get_cooc(request=None, corpus_id=None, cooc_id=None, type='node_link', size=
         # Removing unconnected nodes
         xxx = xx.values
         threshold = min(xxx.max(axis=1))
-        matrix_filtered = np.where(xxx > threshold, xxx, 0)
+        matrix_filtered = np.where(xxx >= threshold, xxx, 0)
 
         #matrix_filtered = matrix_filtered.resize((90,90))
     except:
         PrintException()
 
     try:
-        G = nx.from_numpy_matrix(matrix_filtered)
+        G = nx.from_numpy_matrix(matrix_filtered, create_using=nx.MultiDiGraph())
         G = nx.relabel_nodes(G, dict(enumerate([ labels[label] for label in list(xx.columns)])))
 
         #print(G)
         # Removing too connected nodes (find automatic way to do it)
+        #edges_to_remove = [ e for e in G.edges_iter() if
+
         degree = G.degree()
-        to_remove = [n for n in degree if degree[n] <= 1]
-        G.remove_nodes_from(to_remove)
+        nodes_to_remove = [n for n in degree if degree[n] <= 1]
+        G.remove_nodes_from(nodes_to_remove)
 
         partition = best_partition(G)
     except:

init/init_gargantext.py

@@ -82,9 +82,8 @@ print('Initialize node types...')
 node_types = [
         'Root', 'Trash',
         'Project', 'Corpus', 'Document',
-        'Stem', 'Lem', 'Tfidf',
-        'Synonym',
-        'MiamList', 'StopList',
+        'MiamList', 'StopList', 'MainList',
+        'Stem', 'Lem', 'Group', 'Tfidf',
         'Cooccurrence', 'WhiteList', 'BlackList'
         ]
 
@@ -93,6 +92,20 @@ for node_type in node_types:
 
 # Integration: resource types
 
+print('Initialize users...')
+me = session.query(User).filter(User.username=='alexandre').first()
+gargantua = session.query(User).filter(User.username=='gargantua').first()
+node_root = Node(user_id=gargantua.id, type_id=cache.NodeType['Root'].id, name='Root')
+node_stem = Node(user_id=gargantua.id, type_id=cache.NodeType['Stem'].id, name='Stem', parent_id=node_root.id)
+node_lem = Node(user_id=gargantua.id, type_id=cache.NodeType['Lem'].id, name='Lem', parent_id=node_root.id)
+
+session.add(node_root)
+session.add(node_stem)
+session.add(node_lem)
+session.commit()
+
+
+
 print('Initialize resource...')
 
 from parsing.parsers_config import parsers

init/test_db.py

@@ -35,7 +35,6 @@ extract_ngrams(corpus, ('title', ))
 
 
 
-# print(corpus)
 # corpus = session.query(Node).filter(Node.id == 72771).first()
 # corpus = session.query(Node).filter(Node.id == 73017).first()
 compute_tfidf(corpus)