[FEAT] MyGraph view improved. Nb of nodes and edges. Graph computed already or not...

graph/cooccurrences.py

@@ -219,10 +219,9 @@ def countCooccurrences( corpus_id=None      , cooc_id=None
         print("GRAPH #%s ... Parameters saved in Node." % cooc_id)
         coocNode = session.query(Node).filter(Node.id==cooc_id).first()
         
-        coocNode.hyperdata[distance] = dict()
-        coocNode.hyperdata[distance]["parameters"] = parameters
-        
-        session.add(coocNode)
+        coocNode.hyperdata["parameters"] = dict()
+        coocNode.hyperdata["parameters"] = parameters
+        coocNode.save_hyperdata()
         session.commit()
         
         #data = cooc2graph(coocNode.id, cooc, distance=distance, bridgeness=bridgeness)

graph/graph.py

@@ -69,9 +69,14 @@ def compute_graph( corpus_id=None      , cooc_id=None
         node = session.query(Node).filter(Node.id == cooc_id).first()
 
         if node.hyperdata.get(distance, None) is None:
+            print("GRAPH #%d ... Distance %s has not been computed already." % (cooc_id, distance))
             node.hyperdata[distance] = dict()
 
         node.hyperdata[distance][bridgeness] = data
+        
+        node.hyperdata[distance]["nodes"]    = len(G.nodes())
+        node.hyperdata[distance]["edges"]    = len(G.edges())
+        
         node.save_hyperdata()
         session.commit()
         

graph/views.py

@@ -75,9 +75,6 @@ def myGraphs(request, project_id, corpus_id):
                              .all()
                      )
 
-        #for n in cooc_nodes:
-        #    print(n)
-
         #coocs_count[cooc.id] = len(cooc_nodes)
         coocs_count[cooc.id] = len([cooc_node for cooc_node in cooc_nodes if cooc_node[1] > 1])
 

templates/pages/corpora/myGraphs.html

@@ -27,18 +27,49 @@
                     <div class="col-md-5 content">
                         <li>
                             <h4>{{cooc.name}}</h4>
-                            {{cooc.date}}
+                            {{cooc.date}}<br>
                             {% for key, value in coocs_count.items %}
                                 {% if key == cooc.id %}
                                     {% if value > 0 %}
-
+                                            From: {% if not  cooc.hyperdata.parameters.start  %} begin of corpus {% else %} {{cooc.hyperdata.parameters.start}} {% endif %}
+                                            , To: {% if not  cooc.hyperdata.parameters.end    %} end   of corpus {% else %} {{cooc.hyperdata.parameters.end}}   {% endif %}
+                                            <br>
+                                    
                                     <ul>
-                                    <!-- <li>{{cooc.id}}</li> -->
-                                        <li>From: {% if not  cooc.hyperdata.start  %} begin of corpus {% else %} {{cooc.hyperdata.start}} {% endif %}
-                                            , To:   {% if not  cooc.hyperdata.end    %} end   of corpus {% else %} {{cooc.hyperdata.end}}   {% endif %}
+                                        <li>
+                                            <a href="/projects/{{project.id}}/corpora/{{corpus.id}}/explorer?cooc_id={{cooc.id}}&distance=conditional&bridgeness=5">
+                                            <span class="glyphicon glyphicon-eye-open" aria-hidden="true"></span>
+                                            {% if cooc.hyperdata.conditional %}
+                                                    ~{{ cooc.hyperdata.conditional.nodes }} nodes, 
+                                                    ~{{ cooc.hyperdata.conditional.edges }} edges
+                                                    
+                                                    with <b>Conditional</b> distance
+                                                {% else %}
+                                                    Compute this graph with Conditional distance
+                                            {% endif %}
+                                            </a>
+                                        </li>
+
+                                        <li>
+                                            <a href="/projects/{{project.id}}/corpora/{{corpus.id}}/explorer?cooc_id={{cooc.id}}&distance=distributional&bridgeness=5">
+                                            <span class="glyphicon glyphicon-eye-open" aria-hidden="true"></span>
+                                            {% if cooc.hyperdata.distributional %}
+                                                    ~{{ cooc.hyperdata.distributional.nodes }} nodes, 
+                                                    ~{{ cooc.hyperdata.distributional.edges }} edges
+                                                    
+                                                    with <b>Distributional</b> distance
+                                                {% else %}
+                                                    Compute this graph with Distributional distance
+                                            {% endif %}
+                                            </a>
                                         </li>
-                                        <li> ~{{ value }} nodes with distances:
+                                    </ul>
+                                    <br>
+
+
+                                    <!-- <li>{{cooc.id}}</li> 
                                             <ul>
+
                                                 <li>
                                                 <a href="/projects/{{project.id}}/corpora/{{corpus.id}}/explorer?cooc_id={{cooc.id}}&distance=conditional&bridgeness=5">
                                                 <span class="glyphicon glyphicon-eye-open" aria-hidden="true"></span>
@@ -62,7 +93,7 @@
                                                             )
                                                 </li>
                                             </ul>
-                                    </ul>
+                                    -->
 
                                     {% else %}
                                     <!--