Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
gargantext
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
humanities
gargantext
Commits
fa95e840
Commit
fa95e840
authored
Jan 20, 2017
by
delanoe
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'testing' into stable
parents
636b1c96
2f24d6a8
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
6 deletions
+8
-6
CHANGELOG.md
CHANGELOG.md
+3
-1
main.py
gargantext/util/toolchain/main.py
+2
-2
ngram_coocs.py
gargantext/util/toolchain/ngram_coocs.py
+2
-2
menu.html
templates/pages/menu.html
+1
-1
No files found.
CHANGELOG.md
View file @
fa95e840
...
...
@@ -2,8 +2,10 @@
*
Guided Tour
*
Sources form highlighting crawlers
## Version 3.0.6.
3
## Version 3.0.6.
4
*
COOC SQL improved
## Version 3.0.6.3
*
New buttons
*
Big graphs with conditional distance
...
...
gargantext/util/toolchain/main.py
View file @
fa95e840
...
...
@@ -9,8 +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_old_sqlalchemy_version
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
...
...
gargantext/util/toolchain/ngram_coocs.py
View file @
fa95e840
...
...
@@ -173,7 +173,7 @@ def compute_coocs( corpus,
--
\
--> adding (joining) ngrams that are grouped
LEFT JOIN nodes_ngrams
AS wlAA ON grA.ngram2_id = wlAA.ngram_id
AND wlA.node_id = wlA.node_id
AND wlA
A
.node_id = wlA.node_id
--
\
--> adding (joining) ngrams that are not grouped
--LEFT JOIN ngrams AS wlAA ON grA.ngram2_id = wlAA.id
--
\
--> for joining all synonyms even if they are not in the main list (white list)
...
...
@@ -187,7 +187,7 @@ def compute_coocs( corpus,
--
\
--> adding (joining) ngrams that are grouped
LEFT JOIN nodes_ngrams
AS wlBB ON grB.ngram2_id = wlBB.ngram_id
AND wlB.node_id = wlB.node_id
AND wlB
B
.node_id = wlB.node_id
--
\
--> adding (joining) ngrams that are not grouped
-- LEFT JOIN ngrams AS wlBB ON grB.ngram2_id = wlBB.id
...
...
templates/pages/menu.html
View file @
fa95e840
...
...
@@ -367,7 +367,7 @@
<p>
Gargantext
<span
class=
"glyphicon glyphicon-registration-mark"
aria-hidden=
"true"
></span>
, version 3.0.6.
3
,
, version 3.0.6.
4
,
<a
href=
"http://www.cnrs.fr"
target=
"blank"
title=
"Institution that enables this project."
>
Copyrights
<span
class=
"glyphicon glyphicon-copyright-mark"
aria-hidden=
"true"
></span>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment