Commit 0699cfac authored by delanoe's avatar delanoe

[FIX] Removing Ok button.

parent 2f24d6a8
...@@ -149,7 +149,7 @@ def parse_extract_indexhyperdata(corpus): ...@@ -149,7 +149,7 @@ def parse_extract_indexhyperdata(corpus):
on_list_id = mainlist_id, on_list_id = mainlist_id,
groupings_id = group_id, groupings_id = group_id,
just_pass_result = True, just_pass_result = True,
# symmetry_filter = True, symmetry_filter = True,
diagonal_filter = False) # preserving the diagonal diagonal_filter = False) # preserving the diagonal
# (useful for spec/gen) # (useful for spec/gen)
print('CORPUS #%d: [%s] computed mainlist coocs for specif rank' % (corpus.id, t())) print('CORPUS #%d: [%s] computed mainlist coocs for specif rank' % (corpus.id, t()))
......
...@@ -16,9 +16,12 @@ from sqlalchemy.sql.expression import case # for choice if ngram has mainform or ...@@ -16,9 +16,12 @@ from sqlalchemy.sql.expression import case # for choice if ngram has mainform or
from sqlalchemy import distinct # for list of unique ngram_ids within a corpus from sqlalchemy import distinct # for list of unique ngram_ids within a corpus
from math import log from math import log
from re import match from re import match
from datetime import datetime
# £TODO # £TODO
# from gargantext.util.lists import WeightedIndex # from gargantext.util.lists import WeightedIndex
def t():
return datetime.now().strftime("%Y-%m-%d_%H:%M:%S")
def compute_occs(corpus, overwrite_id = None, groupings_id = None,): def compute_occs(corpus, overwrite_id = None, groupings_id = None,):
""" """
...@@ -106,7 +109,7 @@ def compute_occs(corpus, overwrite_id = None, groupings_id = None,): ...@@ -106,7 +109,7 @@ def compute_occs(corpus, overwrite_id = None, groupings_id = None,):
.group_by("counted_form") .group_by("counted_form")
) )
#print(str(occs_q))
occ_sums = occs_q.all() occ_sums = occs_q.all()
# example result = [(1970, 1.0), (2024, 2.0), (259, 2.0), (302, 1.0), ... ] # example result = [(1970, 1.0), (2024, 2.0), (259, 2.0), (302, 1.0), ... ]
# ^^^^ ^^^ # ^^^^ ^^^
...@@ -325,9 +328,13 @@ def compute_ti_ranking(corpus, ...@@ -325,9 +328,13 @@ def compute_ti_ranking(corpus,
log_tot_docs = log(total_docs) log_tot_docs = log(total_docs)
# result # result
print("%s : Starting Query tf_nd_query" % t())
print(str(tf_nd_query))
tf_nd = tf_nd_query.all() tf_nd = tf_nd_query.all()
print("%s : End Query tf_nd_quer" % t())
# -------------- "sommatoire" sur mot i ---------------- # -------------- "sommatoire" sur mot i ----------------
print("%s : tfidfsum" % t())
tfidfsum = {} tfidfsum = {}
for (ngram_i, tf_i, nd_i) in tf_nd: for (ngram_i, tf_i, nd_i) in tf_nd:
# tfidfsum[ngram_i] = tf_i * log(total_docs/nd_i) # tfidfsum[ngram_i] = tf_i * log(total_docs/nd_i)
...@@ -376,7 +383,6 @@ def compute_ti_ranking(corpus, ...@@ -376,7 +383,6 @@ def compute_ti_ranking(corpus,
return the_id return the_id
def compute_tfidf_local(corpus, def compute_tfidf_local(corpus,
on_list_id=None, on_list_id=None,
groupings_id=None, groupings_id=None,
......
...@@ -398,11 +398,11 @@ ...@@ -398,11 +398,11 @@
<div class="modal-body form-horizontal"> <div class="modal-body form-horizontal">
<div id="msgcontent"></div> <div id="msgcontent"></div>
</div> </div>
<!--
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Ok</button> <a class="btn btn-default" href="http://gargantext.org" >Ok</a>
</div> </div>
--!>
</div> </div>
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment