[FIX] Adding last files for previous commit.

ngram/group.py

@@ -137,24 +137,20 @@ def compute_groups(corpus, limit_inf=None, limit_sup=None, how='Stem'):
         miam_to_insert.add((miam_node.id, n[0],1))
         #print([n for n in group])
         for g in group:
-            if (miam_node.id, g[0],1) not in miam_to_insert:
-#list_to_check.remove(g)
+            if (miam_node.id, g[0], 1) not in miam_to_insert:
                 group_to_insert.append((node_group.id, n[0], g[0], 1))
                 print(n[1], "=", g[1])
-
-# Deleting previous groups
+    # TODO see here if coherent add in miam or group...
+    # Deleting previous groups
     session.query(NodeNgramNgram).filter(NodeNgramNgram.node_id == node_group.id).delete()
     bulk_insert(NodeNgramNgram
                 , ('node_id', 'ngramx_id', 'ngramy_id', 'score')
                 , [data for data in group_to_insert])
 
-#    # stop_id = get_or_create_node(parent_id=corpus.id,user_id=corpus.user_id,nodetype='StopList')
-    #session.commit()
     for n in group_to_insert:
-        print(n)
+        #print(n)
         miam_to_insert.add((miam_node.id, n[1], 1))
+    
     # Deleting previous ngrams miam list
     session.query(NodeNgram).filter(NodeNgram.node_id == miam_node.id).delete()
     bulk_insert(NodeNgram, ('node_id', 'ngram_id', 'weight'), [data for data in list(miam_to_insert)])
-#
-

ngram/lists.py

@@ -27,7 +27,7 @@ def listIds(typeList=None, user_id=None, corpus_id=None):
 
         # Nodes are either in root_list or user_list
         root_list = ['Stem', 'Lem']
-        user_list   = ['MiamList', 'StopList', 'MainList', 'GroupList']
+        user_list   = ['MiamList', 'StopList', 'MapList', 'Group']
 
         if typeList in user_list:
             nodes = session.query(Node).filter(

node/models.py

@@ -366,13 +366,13 @@ class NodeNgramNgram(models.Model):
 class NodeHyperdataNgram(models.Model):
     node       = models.ForeignKey(Node, on_delete=models.CASCADE)
 
-    hyperdata_id      = models.ForeignKey(Hyperdata, related_name="nodehyperdatamngramx", on_delete=models.CASCADE)
-    ngram_id          = models.ForeignKey(Ngram, related_name="nodehyperdatangramy", on_delete=models.CASCADE)
+    hyperdata      = models.ForeignKey(Hyperdata, on_delete=models.CASCADE)
+    ngram          = models.ForeignKey(Ngram, on_delete=models.CASCADE)
 
     score       = models.FloatField(default=0)
 
     def __str__(self):
-        return "%s: %s / %s" % (self.node.name, self.hyperdata_id.value_string, self.ngram_id.terms)
+        return "%s: %s / %s" % (self.node.name, self.hyperdata.value_string, self.ngram.terms)
 
 
 class NodeNodeNgram(models.Model):