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
157
Issues
157
List
Board
Labels
Milestones
Merge Requests
9
Merge Requests
9
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
gargantext
haskell-gargantext
Commits
19ff6e2c
Commit
19ff6e2c
authored
Nov 19, 2021
by
Alexandre Delanoë
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[FIX] Order 2 distance is ok (needs node size in graph still)
parent
96a7bf42
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
7 deletions
+9
-7
Distances.hs
src/Gargantext/Core/Methods/Distances.hs
+3
-3
Distributional.hs
...ntext/Core/Methods/Distances/Accelerate/Distributional.hs
+4
-2
API.hs
src/Gargantext/Core/Viz/Graph/API.hs
+2
-2
No files found.
src/Gargantext/Core/Methods/Distances.hs
View file @
19ff6e2c
...
@@ -14,21 +14,21 @@ Portability : POSIX
...
@@ -14,21 +14,21 @@ Portability : POSIX
module
Gargantext.Core.Methods.Distances
module
Gargantext.Core.Methods.Distances
where
where
-- import Debug.Trace (trace)
import
Data.Aeson
import
Data.Aeson
import
Data.Array.Accelerate
(
Matrix
)
import
Data.Array.Accelerate
(
Matrix
)
import
Data.Swagger
import
Data.Swagger
import
GHC.Generics
(
Generic
)
import
GHC.Generics
(
Generic
)
import
Gargantext.Core.Methods.Distances.Accelerate.Conditional
(
measureConditional
)
import
Gargantext.Core.Methods.Distances.Accelerate.Conditional
(
measureConditional
)
import
Gargantext.Core.Methods.Distances.Accelerate.Distributional
(
logDistributional
)
import
Gargantext.Core.Methods.Distances.Accelerate.Distributional
(
logDistributional
)
import
Gargantext.Prelude
(
Ord
,
Eq
,
Int
,
Double
)
import
Gargantext.Prelude
(
Ord
,
Eq
,
Int
,
Double
,
Show
{-, ($), show-}
)
import
Gargantext.Prelude
(
Show
)
import
Prelude
(
Enum
,
Bounded
,
minBound
,
maxBound
)
import
Prelude
(
Enum
,
Bounded
,
minBound
,
maxBound
)
import
Test.QuickCheck
(
elements
)
import
Test.QuickCheck
(
elements
)
import
Test.QuickCheck.Arbitrary
import
Test.QuickCheck.Arbitrary
------------------------------------------------------------------------
------------------------------------------------------------------------
data
Distance
=
Conditional
|
Distributional
data
Distance
=
Conditional
|
Distributional
deriving
(
Show
)
deriving
(
Show
,
Eq
)
measure
::
Distance
->
Matrix
Int
->
Matrix
Double
measure
::
Distance
->
Matrix
Int
->
Matrix
Double
measure
Conditional
=
measureConditional
measure
Conditional
=
measureConditional
...
...
src/Gargantext/Core/Methods/Distances/Accelerate/Distributional.hs
View file @
19ff6e2c
...
@@ -126,6 +126,8 @@ logDistributional m = run
...
@@ -126,6 +126,8 @@ logDistributional m = run
logDistributional'
::
Int
->
Matrix
Int
->
Acc
(
Matrix
Double
)
logDistributional'
::
Int
->
Matrix
Int
->
Acc
(
Matrix
Double
)
logDistributional'
n
m'
=
result
logDistributional'
n
m'
=
result
where
where
-- From Matrix Int to Matrix Double, i.e :
-- m :: Matrix Int -> Matrix Double
m
=
map
fromIntegral
$
use
m'
m
=
map
fromIntegral
$
use
m'
-- Scalar. Sum of all elements of m.
-- Scalar. Sum of all elements of m.
...
...
src/Gargantext/Core/Viz/Graph/API.hs
View file @
19ff6e2c
...
@@ -180,8 +180,8 @@ computeGraph cId d nt repo = do
...
@@ -180,8 +180,8 @@ computeGraph cId d nt repo = do
let
ngs
=
filterListWithRoot
MapTerm
let
ngs
=
filterListWithRoot
MapTerm
$
mapTermListRoot
[
lId
]
nt
repo
$
mapTermListRoot
[
lId
]
nt
repo
myCooc
<-
HashMap
.
filter
(
>
2
)
-- Removing the hapax (ngrams with 1 cooc)
myCooc
<-
HashMap
.
filter
(
>
1
)
-- Removing the hapax (ngrams with 1 cooc)
<$>
getCoocByNgrams
(
Diagonal
Tru
e
)
<$>
getCoocByNgrams
(
if
d
==
Conditional
then
Diagonal
True
else
Diagonal
Fals
e
)
<$>
groupNodesByNgrams
ngs
<$>
groupNodesByNgrams
ngs
<$>
getNodesByNgramsOnlyUser
cId
(
lIds
<>
[
lId
])
nt
(
HashMap
.
keys
ngs
)
<$>
getNodesByNgramsOnlyUser
cId
(
lIds
<>
[
lId
])
nt
(
HashMap
.
keys
ngs
)
...
...
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