Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
haskell-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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Christian Merten
haskell-gargantext
Commits
00ced273
Commit
00ced273
authored
Nov 25, 2022
by
Alexandre Delanoë
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[VERSION] +1 to 0.0.6.8.5.1
parent
439d3771
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
15 deletions
+17
-15
CHANGELOG.md
CHANGELOG.md
+4
-0
gargantext.cabal
gargantext.cabal
+1
-1
package.yaml
package.yaml
+1
-1
List.hs
src/Gargantext/API/Ngrams/List.hs
+7
-10
WithList.hs
src/Gargantext/Core/Text/Terms/WithList.hs
+4
-3
No files found.
CHANGELOG.md
View file @
00ced273
## Version 0.0.6.8.5.1
*
[
BACK
][
FIX
]
ArXiv search in Abstracts by default
## Version 0.0.6.8.5
*
[
BACK
][
FIX
][
Ngrams Table, page sort / limit (#149)
](
https://gitlab.iscpif.fr/gargantext/haskell-gargantext/issues/149
)
*
[
FRONT
][
FIX
][
Security Issue with Teams (#452)
](
https://gitlab.iscpif.fr/gargantext/purescript-gargantext/issues/452
)
...
...
gargantext.cabal
View file @
00ced273
...
...
@@ -5,7 +5,7 @@ cabal-version: 1.12
-- see: https://github.com/sol/hpack
name: gargantext
version:
0.0.6.8.5
version:
0.0.6.8.5.1
synopsis: Search, map, share
description: Please see README.md
category: Data
...
...
package.yaml
View file @
00ced273
...
...
@@ -6,7 +6,7 @@ name: gargantext
# | | | +----- Layers * : New versions with API additions
# | | | | +--- Layers * : New versions without API breaking changes
# | | | | |
version
:
'
0.0.6.8.5'
version
:
'
0.0.6.8.5
.1
'
synopsis
:
Search, map, share
description
:
Please see README.md
category
:
Data
...
...
src/Gargantext/API/Ngrams/List.hs
View file @
00ced273
...
...
@@ -130,26 +130,23 @@ reIndexWith :: ( HasNodeStory env err m
->
Set
ListType
->
m
()
reIndexWith
cId
lId
nt
lts
=
do
printDebug
"(cId,lId,nt,lts)"
(
cId
,
lId
,
nt
,
lts
)
-- Getting [NgramsTerm]
ts
<-
List
.
concat
<$>
map
(
\
(
k
,
vs
)
->
k
:
vs
)
<$>
HashMap
.
toList
<$>
getTermsWith
identity
[
lId
]
nt
lts
-- printDebug "ts" ts
-- Taking the ngrams with 0 occurrences only (orphans)
-- occs <- getOccByNgramsOnlyFast' cId lId nt ts
-- printDebug "occs" occs
let
orphans
=
ts
{- List.concat
$ map (\t -> case HashMap.lookup t occs of
Nothing -> [t]
Just n -> if n <= 1 then [t] else [ ]
) ts
-}
-- printDebug "orphans" orphans
-}
printDebug
"orphans"
orphans
-- Get all documents of the corpus
docs
<-
selectDocNodes
cId
...
...
@@ -171,12 +168,12 @@ reIndexWith cId lId nt lts = do
(
List
.
cycle
[
Map
.
fromList
$
[(
nt
,
Map
.
singleton
(
doc
^.
context_id
)
1
)]])
)
docs
-- printDebug "ngramsByDoc
" ngramsByDoc
printDebug
"ngramsByDoc:
"
ngramsByDoc
-- Saving the indexation in database
_
<-
mapM
(
saveDocNgramsWith
lId
)
ngramsByDoc
pure
()
-- ngramsByDoc
pure
()
toIndexedNgrams
::
HashMap
Text
NgramsId
->
Text
->
Maybe
(
Indexed
Int
Ngrams
)
toIndexedNgrams
m
t
=
Indexed
<$>
i
<*>
n
...
...
src/Gargantext/Core/Text/Terms/WithList.hs
View file @
00ced273
...
...
@@ -49,12 +49,13 @@ replaceTerms pats terms = go 0
Just
(
len
,
term
)
->
term
:
go
(
ix
+
len
)
{-
merge (len1, lab1) (len2, lab2) =
if len2 < len1 then (len1, lab1) else (len2, lab2)
-}
m
=
IntMap
.
fromListWith
merge
-- IntMap.fromListWith merge -- Taking the longer ngrams only
IntMap
.
fromList
[
(
ix
,
(
len
,
term
))
|
Pattern
pat
len
term
<-
pats
,
ix
<-
KMP
.
match
pat
terms
]
...
...
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