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
150
Issues
150
List
Board
Labels
Milestones
Merge Requests
6
Merge Requests
6
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
cb29fbd9
Commit
cb29fbd9
authored
May 10, 2019
by
Quentin Lobbé
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev-phylo' of
https://gitlab.iscpif.fr/gargantext/haskell-gargantext
into dev-phylo
parents
a893c2f4
69567578
Pipeline
#378
failed with stage
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
Main.hs
bin/gargantext-phylo/Main.hs
+2
-0
Fis.hs
src/Gargantext/Viz/Phylo/Aggregates/Fis.hs
+1
-1
LevelMaker.hs
src/Gargantext/Viz/Phylo/LevelMaker.hs
+1
-2
No files found.
bin/gargantext-phylo/Main.hs
View file @
cb29fbd9
...
@@ -41,10 +41,12 @@ import Gargantext.Viz.Phylo.LevelMaker
...
@@ -41,10 +41,12 @@ import Gargantext.Viz.Phylo.LevelMaker
import
Gargantext.Viz.Phylo.View.Export
import
Gargantext.Viz.Phylo.View.Export
import
Gargantext.Viz.Phylo.View.ViewMaker
import
Gargantext.Viz.Phylo.View.ViewMaker
import
Gargantext.Database.Types.Node
import
Gargantext.Database.Types.Node
import
Data.Maybe
import
Data.Maybe
import
qualified
Data.Map
as
DM
import
qualified
Data.Map
as
DM
import
qualified
Data.Vector
as
DV
import
qualified
Data.Vector
as
DV
import
qualified
Data.List
as
DL
import
qualified
Data.List
as
DL
...
...
src/Gargantext/Viz/Phylo/Aggregates/Fis.hs
View file @
cb29fbd9
...
@@ -110,4 +110,4 @@ traceFis lbl m = trace (lbl <> "count : " <> show (sum $ map length $ elems m) <
...
@@ -110,4 +110,4 @@ traceFis lbl m = trace (lbl <> "count : " <> show (sum $ map length $ elems m) <
supps
::
Vector
Double
supps
::
Vector
Double
supps
=
Vector
.
fromList
$
sort
$
map
(
fromIntegral
.
_phyloFis_support
)
$
concat
$
elems
m
supps
=
Vector
.
fromList
$
sort
$
map
(
fromIntegral
.
_phyloFis_support
)
$
concat
$
elems
m
ngrms
::
Vector
Double
ngrms
::
Vector
Double
ngrms
=
Vector
.
fromList
$
sort
$
map
(
\
f
->
fromIntegral
$
Set
.
size
$
_phyloFis_clique
f
)
$
concat
$
elems
m
ngrms
=
Vector
.
fromList
$
sort
$
map
(
\
f
->
fromIntegral
$
Set
.
size
$
_phyloFis_clique
f
)
$
concat
$
elems
m
\ No newline at end of file
src/Gargantext/Viz/Phylo/LevelMaker.hs
View file @
cb29fbd9
...
@@ -36,7 +36,6 @@ import Gargantext.Viz.Phylo.Tools
...
@@ -36,7 +36,6 @@ import Gargantext.Viz.Phylo.Tools
import
Gargantext.Text.Context
(
TermList
)
import
Gargantext.Text.Context
(
TermList
)
import
qualified
Data.Vector.Storable
as
VS
import
qualified
Data.Vector.Storable
as
VS
import
qualified
Data.Set
as
Set
import
qualified
Data.Set
as
Set
import
qualified
Data.Vector
as
Vector
import
qualified
Data.Vector
as
Vector
...
@@ -312,4 +311,4 @@ traceBranches lvl p = trace ( "----\n" <> "Branches in Phylo" <> show lvl <> " :
...
@@ -312,4 +311,4 @@ traceBranches lvl p = trace ( "----\n" <> "Branches in Phylo" <> show lvl <> " :
brs
=
sort
$
map
(
\
(
_
,
gs
)
->
fromIntegral
$
length
gs
)
brs
=
sort
$
map
(
\
(
_
,
gs
)
->
fromIntegral
$
length
gs
)
$
filter
(
\
(
id
,
_
)
->
(
fst
id
)
==
lvl
)
$
filter
(
\
(
id
,
_
)
->
(
fst
id
)
==
lvl
)
$
getGroupsByBranches
p
$
getGroupsByBranches
p
--------------------------------------
--------------------------------------
\ No newline at end of file
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