Commit cb29fbd9 authored by Quentin Lobbé's avatar Quentin Lobbé

Merge branch 'dev-phylo' of https://gitlab.iscpif.fr/gargantext/haskell-gargantext into dev-phylo

parents a893c2f4 69567578
Pipeline #378 failed with stage
...@@ -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
......
...@@ -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
...@@ -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
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