Now some parameters are saved in the Node (hyperdata):

- Map List Node id
- Group List Node id

- Start date (UTC format)
- End date (UTC format)

For now, this parameters should be added:
- distance (conditional or distributional)
- bridgeness

Need some refactoring to enable this.

graph/cooccurrences.py

@@ -49,6 +49,11 @@ def countCooccurrences( corpus_id=None         , test= False
     # Security test
     field1,field2 = str(field1), str(field2)
 
+    # Parameters to save in hyperdata of the Node Cooc
+    parameters = dict()
+    parameters['field1'] = field1
+    parameters['field2'] = field2
+
     # Get corpus as Python object
     corpus = session.query(Node).filter(Node.id==corpus_id).first()
 
@@ -65,7 +70,7 @@ def countCooccurrences( corpus_id=None         , test= False
         if not coocNode_id:
             coocNode = corpus.add_child(
             typename  = "COOCCURRENCES",
-            name = "GRAPH EXPLORER COOC (in:%s)" % corpus.id
+            name = "GRAPH (in corpus %s)" % corpus.id
             )
 
             session.add(coocNode)
@@ -168,6 +173,8 @@ def countCooccurrences( corpus_id=None         , test= False
                                 .filter( Start.value_utc >= date_start_utc)
                       )
 
+        parameters['start'] = date_start_utc
+
 
     if end is not None:
         # TODO : more complexe date format here.
@@ -183,6 +190,7 @@ def countCooccurrences( corpus_id=None         , test= False
                                 .filter( End.value_utc <= date_end_utc )
                       )
 
+        parameters['end'] = date_end_utc
 
     if isMonopartite:
         # Cooc is symetric, take only the main cooccurrences and cut at the limit
@@ -202,8 +210,20 @@ def countCooccurrences( corpus_id=None         , test= False
     matrix = WeightedMatrix(cooc_query)
     cooc = filterMatrix(matrix, mapList_id, groupList_id)
 
+    parameters['MapList_id'] = str(mapList_id)
+    parameters['GroupList_id'] = str(mapList_id)
+
     if save_on_db:
+        # Saving cooc Matrix
         cooc.save(coocNode_id)
+        
+        # Saving the parameters
+        coocNode = session.query(Node).filter(Node.id==coocNode_id).first()
+        coocNode.hyperdata = parameters
+        session.add(coocNode)
+        session.commit()
+        
+        # Log message
         print("Cooccurrence Matrix saved")
     
     return cooc

graph/graph.py

@@ -43,8 +43,8 @@ def get_graph( request=None         , corpus=None
     2) filter and cluster By Distances (function clusterByDistances)
             main parameter: distance
 
-    3) filter By Bridgeness (filter By Bridgeness)
-            main parameter: bridgness
+    3) filter By Bridgeness (function filterByBridgeness)
+            main parameter: bridgeness
 
     4) format the graph     (formatGraph)
             main parameter: format_

graph/views.py

@@ -67,16 +67,16 @@ def myGraphs(request, project_id, corpus_id):
         template_name = 'pages/corpora/myGraphs.html',
         request = request,
         context = {
-            'debug'     : settings.DEBUG,
-            'request'   : request,
-            'user'      : request.user,
-            'date'      : datetime.now(),
-            'project'   : project,
+            'debug'        : settings.DEBUG,
+            'request'      : request,
+            'user'         : request.user,
+            'date'         : datetime.now(),
+            'project'      : project,
             'resourcename' : resourcename(corpus),
-            'corpus'    : corpus,
-            'view'      : 'myGraph',
-            'coocs'     : coocs,
-            'coocs_count' : coocs_count
+            'corpus'       : corpus,
+            'view'         : 'myGraph',
+            'coocs'        : coocs,
+            'coocs_count'  : coocs_count
         },
     )
 

templates/pages/corpora/myGraphs.html

@@ -25,16 +25,15 @@
                 
                 <div class="col-md-5 content">
                     <a href="/projects/{{project.id}}/corpora/{{corpus.id}}/explorer?cooc_id={{cooc.id}}">
-                        {{cooc.id}} {{ cooc.name }} 
-                          
-                        (size = 
+                        {{cooc.id}} {{ cooc.name }} {{cooc.hyperdata}}
                           
+                        (
                             {% for key, value in coocs_count.items %} 
                                 {% if key == cooc.id %}
                                 {{value}}
                                 {% endif %}
                             {% endfor %}
-                          )
+                        nodes)
                     </a>
                 </div>
                 <div class="col-md-3 content">