Merge branch 'testing' into stable

gargantext/util/toolchain/main.py

@@ -9,7 +9,8 @@ from .list_stop           import do_stoplist
 from .ngram_groups        import compute_groups
 from .metric_tfidf        import compute_occs, compute_tfidf_local, compute_ti_ranking
 from .list_main           import do_mainlist
-from .ngram_coocs         import compute_coocs
+#from .ngram_coocs         import compute_coocs
+from .ngram_coocs_old_sqlalchemy_version import compute_coocs
 from .metric_specgen      import compute_specgen
 from .list_map            import do_maplist
 from .mail_notification   import notify_owner
@@ -148,6 +149,7 @@ def parse_extract_indexhyperdata(corpus):
                             on_list_id = mainlist_id,
                             groupings_id = group_id,
                             just_pass_result = True,
+                           # symmetry_filter  = True,
                             diagonal_filter = False) # preserving the diagonal
                                                      # (useful for spec/gen)
     print('CORPUS #%d: [%s] computed mainlist coocs for specif rank' % (corpus.id, t()))

gargantext/util/toolchain/ngram_coocs.py

@@ -172,7 +172,7 @@ def compute_coocs(  corpus,
                       AND grA.node_id  = {groupings_id}
         -- \--> adding (joining) ngrams that are grouped
         LEFT JOIN  nodes_ngrams
-               AS wlAA ON grA.ngram2_id = wlAA.id
+               AS wlAA ON grA.ngram2_id = wlAA.ngram_id
                       AND wlA.node_id  = wlA.node_id 
         -- \--> adding (joining) ngrams that are not grouped
         --LEFT JOIN  ngrams        AS wlAA ON grA.ngram2_id = wlAA.id
@@ -186,7 +186,7 @@ def compute_coocs(  corpus,
                       AND grB.node_id  = {groupings_id}
         -- \--> adding (joining) ngrams that are grouped
         LEFT JOIN  nodes_ngrams 
-               AS wlBB ON grB.ngram2_id = wlBB.id
+               AS wlBB ON grB.ngram2_id = wlBB.ngram_id
                       AND wlB.node_id   = wlB.node_id
         -- \--> adding (joining) ngrams that are not grouped
 
@@ -218,6 +218,7 @@ def compute_coocs(  corpus,
 
     # 7) Building the final query
     final_sql += cooc_sql + select_cooc_sql
+    #final_sql += ";\n reset work_mem;"
 
     # 6) EXECUTE QUERY
     # ----------------