[refactor] foldl -> foldl'

This is according to the blog

http://h2.jaguarpaw.co.uk/posts/foldl-traverses-state-foldr-traverses-anything/
parent 34c2ef06
...@@ -147,7 +147,7 @@ instance Arbitrary PublicData where ...@@ -147,7 +147,7 @@ instance Arbitrary PublicData where
defaultPublicData :: PublicData defaultPublicData :: PublicData
defaultPublicData = defaultPublicData =
PublicData { title = "Title" PublicData { title = "Title"
, abstract = foldl (<>) "" $ replicate 100 "abstract " , abstract = foldl' (<>) "" $ replicate 100 "abstract "
, img = "images/Gargantextuel-212x300.jpg" , img = "images/Gargantextuel-212x300.jpg"
, url = "https://.." , url = "https://.."
, date = "YY/MM/DD" , date = "YY/MM/DD"
......
...@@ -387,7 +387,7 @@ getNodeStory c nId = do ...@@ -387,7 +387,7 @@ getNodeStory c nId = do
pure () pure ()
-} -}
pure $ NodeStory $ Map.singleton nId $ foldl combine initArchive dbData pure $ NodeStory $ Map.singleton nId $ foldl' combine initArchive dbData
where where
-- NOTE (<>) for Archive doesn't concatenate states, so we have to use `combine` -- NOTE (<>) for Archive doesn't concatenate states, so we have to use `combine`
combine a1 a2 = a1 & a_state %~ combineState (a2 ^. a_state) combine a1 a2 = a1 & a_state %~ combineState (a2 ^. a_state)
......
...@@ -56,8 +56,8 @@ toDoc' la (HAL.Corpus { .. }) = do ...@@ -56,8 +56,8 @@ toDoc' la (HAL.Corpus { .. }) = do
, _hd_uniqIdBdd = Nothing , _hd_uniqIdBdd = Nothing
, _hd_page = Nothing , _hd_page = Nothing
, _hd_title = Just $ intercalate " " _corpus_title , _hd_title = Just $ intercalate " " _corpus_title
, _hd_authors = Just $ foldl (\x y -> if x == "" then y else x <> ", " <> y) "" _corpus_authors_names , _hd_authors = Just $ foldl' (\x y -> if x == "" then y else x <> ", " <> y) "" _corpus_authors_names
, _hd_institutes = Just $ foldl (\x y -> if x == "" then y else x <> ", " <> y) "" $ _corpus_authors_affiliations <> map show _corpus_struct_id , _hd_institutes = Just $ foldl' (\x y -> if x == "" then y else x <> ", " <> y) "" $ _corpus_authors_affiliations <> map show _corpus_struct_id
, _hd_source = Just $ maybe "Nothing" identity _corpus_source , _hd_source = Just $ maybe "Nothing" identity _corpus_source
, _hd_abstract = Just abstract , _hd_abstract = Just abstract
, _hd_publication_date = fmap show utctime , _hd_publication_date = fmap show utctime
......
...@@ -92,7 +92,7 @@ toDocs v = V.toList ...@@ -92,7 +92,7 @@ toDocs v = V.toList
, d_authors = csv_authors }) , d_authors = csv_authors })
(V.enumFromN 1 (V.length v'')) v'' (V.enumFromN 1 (V.length v'')) v''
where where
v'' = V.foldl (\v' sep -> V.concatMap (splitDoc (docsSize v') sep) v') v seps v'' = V.foldl' (\v' sep -> V.concatMap (splitDoc (docsSize v') sep) v') v seps
seps= (V.fromList [Paragraphs 1, Sentences 3, Chars 3]) seps= (V.fromList [Paragraphs 1, Sentences 3, Chars 3])
--------------------------------------------------------------- ---------------------------------------------------------------
......
...@@ -15,7 +15,7 @@ module Gargantext.Core.Text.Corpus.Parsers.FrameWrite ...@@ -15,7 +15,7 @@ module Gargantext.Core.Text.Corpus.Parsers.FrameWrite
import Data.Either import Data.Either
import Data.List qualified as List import Data.List qualified as List
import Data.Maybe import Data.Maybe
import Data.Text hiding (foldl) import Data.Text hiding (foldl')
import Data.Text qualified as DT import Data.Text qualified as DT
import Gargantext.Core.Text (sentences) import Gargantext.Core.Text (sentences)
import Gargantext.Prelude hiding (ByteString, (<|>), many, try) import Gargantext.Prelude hiding (ByteString, (<|>), many, try)
...@@ -105,7 +105,7 @@ data Line = ...@@ -105,7 +105,7 @@ data Line =
deriving (Show) deriving (Show)
parseLines :: Text -> Either ParseError Parsed parseLines :: Text -> Either ParseError Parsed
parseLines text = foldl f emptyParsed <$> lst parseLines text = foldl' f emptyParsed <$> lst
where where
lst = parse documentLines "" (unpack text) lst = parse documentLines "" (unpack text)
f (Parsed { .. }) (LAuthors as) = Parsed { authors = as , .. } f (Parsed { .. }) (LAuthors as) = Parsed { authors = as , .. }
......
...@@ -41,9 +41,9 @@ toDoc la (ISTEX.Document i t a ab d s) = do ...@@ -41,9 +41,9 @@ toDoc la (ISTEX.Document i t a ab d s) = do
, _hd_uniqIdBdd = Nothing , _hd_uniqIdBdd = Nothing
, _hd_page = Nothing , _hd_page = Nothing
, _hd_title = t , _hd_title = t
, _hd_authors = Just $ foldl (\x y -> if x == "" then y else x <> ", " <> y) "" (map ISTEX._author_name a) , _hd_authors = Just $ foldl' (\x y -> if x == "" then y else x <> ", " <> y) "" (map ISTEX._author_name a)
, _hd_institutes = Just $ foldl (\x y -> if x == "" then y else x <> ", " <> y) "" (concat $ (map ISTEX._author_affiliations) a) , _hd_institutes = Just $ foldl' (\x y -> if x == "" then y else x <> ", " <> y) "" (concat $ (map ISTEX._author_affiliations) a)
, _hd_source = Just $ foldl (\x y -> if x == "" then y else x <> ", " <> y) "" (ISTEX._source_title s) , _hd_source = Just $ foldl' (\x y -> if x == "" then y else x <> ", " <> y) "" (ISTEX._source_title s)
, _hd_abstract = ab , _hd_abstract = ab
, _hd_publication_date = fmap (T.pack . show) utctime , _hd_publication_date = fmap (T.pack . show) utctime
, _hd_publication_year = pub_year , _hd_publication_year = pub_year
......
...@@ -103,7 +103,7 @@ grid s e tr te = do ...@@ -103,7 +103,7 @@ grid s e tr te = do
score'' :: Map (Maybe Bool) Int -> Double score'' :: Map (Maybe Bool) Int -> Double
score'' m'' = maybe 0 (\t -> (fromIntegral t)/total) (Map.lookup (Just True) m'') score'' m'' = maybe 0 (\t -> (fromIntegral t)/total) (Map.lookup (Just True) m'')
where where
total = fromIntegral $ foldl (+) 0 $ Map.elems m'' total = fromIntegral $ foldl' (+) 0 $ Map.elems m''
getScore m t = do getScore m t = do
let (res, toGuess) = List.unzip let (res, toGuess) = List.unzip
......
...@@ -20,7 +20,7 @@ countElem :: (Ord k) => DM.Map k Int -> k -> DM.Map k Int ...@@ -20,7 +20,7 @@ countElem :: (Ord k) => DM.Map k Int -> k -> DM.Map k Int
countElem m e = DM.insertWith (+) e 1 m countElem m e = DM.insertWith (+) e 1 m
freq :: (Ord k) => [k] -> DM.Map k Int freq :: (Ord k) => [k] -> DM.Map k Int
freq = foldl countElem DM.empty freq = foldl' countElem DM.empty
getMaxFromMap :: Ord a => Map a1 a -> [a1] getMaxFromMap :: Ord a => Map a1 a -> [a1]
getMaxFromMap m = go [] Nothing (DM.toList m) getMaxFromMap m = go [] Nothing (DM.toList m)
......
...@@ -229,7 +229,7 @@ instance IsTrie Trie where ...@@ -229,7 +229,7 @@ instance IsTrie Trie where
nodeChild k (Node _ _ cs) = fromMaybe emptyTrie (Map.lookup k cs) nodeChild k (Node _ _ cs) = fromMaybe emptyTrie (Map.lookup k cs)
nodeChild _ (Leaf _) = emptyTrie nodeChild _ (Leaf _) = emptyTrie
findTrie ks t = L.foldl (flip nodeChild) t ks findTrie ks t = L.foldl' (flip nodeChild) t ks
printTrie inE t = do printTrie inE t = do
P.putStrLn . Tree.drawTree P.putStrLn . Tree.drawTree
......
...@@ -167,7 +167,7 @@ instance Semigroup TokenTag where ...@@ -167,7 +167,7 @@ instance Semigroup TokenTag where
instance Monoid TokenTag where instance Monoid TokenTag where
mempty = TokenTag [] empty Nothing Nothing mempty = TokenTag [] empty Nothing Nothing
mconcat = foldl mappend mempty mconcat = foldl' mappend mempty
-- mappend t1 t2 = (<>) t1 t2 -- mappend t1 t2 = (<>) t1 t2
......
...@@ -292,7 +292,7 @@ filterByBranchSize thr export = ...@@ -292,7 +292,7 @@ filterByBranchSize thr export =
processFilters :: [Filter] -> Quality -> PhyloExport -> PhyloExport processFilters :: [Filter] -> Quality -> PhyloExport -> PhyloExport
processFilters filters qua export = processFilters filters qua export =
foldl (\export' f -> case f of foldl' (\export' f -> case f of
ByBranchSize thr -> if (thr < (fromIntegral $ qua ^. qua_minBranch)) ByBranchSize thr -> if (thr < (fromIntegral $ qua ^. qua_minBranch))
then filterByBranchSize (fromIntegral $ qua ^. qua_minBranch) export' then filterByBranchSize (fromIntegral $ qua ^. qua_minBranch) export'
else filterByBranchSize thr export' else filterByBranchSize thr export'
...@@ -488,8 +488,8 @@ mostInclusive nth foundations export = ...@@ -488,8 +488,8 @@ mostInclusive nth foundations export =
. traverse ) . traverse )
(\b -> (\b ->
let groups = filter (\g -> g ^. phylo_groupBranchId == b ^. branch_id) $ export ^. export_groups let groups = filter (\g -> g ^. phylo_groupBranchId == b ^. branch_id) $ export ^. export_groups
cooc = foldl (\acc g -> unionWith (+) acc (g ^. phylo_groupCooc)) empty groups cooc = foldl' (\acc g -> unionWith (+) acc (g ^. phylo_groupCooc)) empty groups
ngrams = sort $ foldl (\acc g -> union acc (g ^. phylo_groupNgrams)) [] groups ngrams = sort $ foldl' (\acc g -> union acc (g ^. phylo_groupNgrams)) [] groups
inc = map (\n -> inclusion cooc (ngrams \\ [n]) n) ngrams inc = map (\n -> inclusion cooc (ngrams \\ [n]) n) ngrams
lbl = ngramsToLabel foundations $ getNthMostMeta nth inc ngrams lbl = ngramsToLabel foundations $ getNthMostMeta nth inc ngrams
in b & branch_label .~ lbl ) export in b & branch_label .~ lbl ) export
...@@ -513,7 +513,7 @@ mostEmergentInclusive nth foundations export = ...@@ -513,7 +513,7 @@ mostEmergentInclusive nth foundations export =
processLabels :: [PhyloLabel] -> Vector Ngrams -> Map Int Double -> PhyloExport -> PhyloExport processLabels :: [PhyloLabel] -> Vector Ngrams -> Map Int Double -> PhyloExport -> PhyloExport
processLabels labels foundations freq export = processLabels labels foundations freq export =
foldl (\export' label -> foldl' (\export' label ->
case label of case label of
GroupLabel tagger nth -> GroupLabel tagger nth ->
case tagger of case tagger of
...@@ -565,7 +565,7 @@ processDynamics groups = ...@@ -565,7 +565,7 @@ processDynamics groups =
let dates' = sort dates let dates' = sort dates
in (head' "dynamics" dates', last' "dynamics" dates')) in (head' "dynamics" dates', last' "dynamics" dates'))
$ fromListWith (++) $ fromListWith (++)
$ foldl (\acc g -> acc ++ ( map (\n -> (n,[fst $ g ^. phylo_groupPeriod, snd $ g ^. phylo_groupPeriod])) $ foldl' (\acc g -> acc ++ ( map (\n -> (n,[fst $ g ^. phylo_groupPeriod, snd $ g ^. phylo_groupPeriod]))
$ (g ^. phylo_groupNgrams))) [] groups $ (g ^. phylo_groupNgrams))) [] groups
......
...@@ -121,7 +121,7 @@ evolvSeaLadder nbFdt lambda freq similarities graph = map snd ...@@ -121,7 +121,7 @@ evolvSeaLadder nbFdt lambda freq similarities graph = map snd
-------- --------
-- 1.2) -- 1.2)
qua' :: [(Double,Double)] qua' :: [(Double,Double)]
qua' = foldl (\acc (s,q) -> qua' = foldl' (\acc (s,q) ->
if length acc == 0 if length acc == 0
then [(s,q)] then [(s,q)]
else if (snd (List.last acc)) == q else if (snd (List.last acc)) == q
...@@ -203,13 +203,13 @@ appendGroups f lvl m phylo = ...@@ -203,13 +203,13 @@ appendGroups f lvl m phylo =
pId' = phyloLvl ^. phylo_scalePeriodStr pId' = phyloLvl ^. phylo_scalePeriodStr
phyloCUnit = m ! pId phyloCUnit = m ! pId
in phyloLvl in phyloLvl
& phylo_scaleGroups .~ (fromList $ foldl (\groups obj -> & phylo_scaleGroups .~ (fromList $ foldl' (\groups obj ->
groups ++ [ (((pId,lvl),length groups) groups ++ [ (((pId,lvl),length groups)
, f obj pId pId' lvl (length groups) , f obj pId pId' lvl (length groups)
-- select the cooc of the periods -- select the cooc of the periods
(elems $ restrictKeys (getCoocByDate phylo) $ periodsToYears [pId]) (elems $ restrictKeys (getCoocByDate phylo) $ periodsToYears [pId])
-- select and merge the roots count of the periods -- select and merge the roots count of the periods
(foldl (\acc count -> unionWith (+) acc count) empty (foldl' (\acc count -> unionWith (+) acc count) empty
$ elems $ restrictKeys (getRootsCountByDate phylo) $ periodsToYears [pId])) $ elems $ restrictKeys (getRootsCountByDate phylo) $ periodsToYears [pId]))
] ) [] phyloCUnit) ] ) [] phyloCUnit)
else else
...@@ -312,7 +312,7 @@ filterCliqueBySize thr l = filter (\clq -> (length $ clq ^. clustering_roots) >= ...@@ -312,7 +312,7 @@ filterCliqueBySize thr l = filter (\clq -> (length $ clq ^. clustering_roots) >=
filterCliqueByNested :: Map (Date, Date) [Clustering] -> Map (Date, Date) [Clustering] filterCliqueByNested :: Map (Date, Date) [Clustering] -> Map (Date, Date) [Clustering]
filterCliqueByNested m = filterCliqueByNested m =
let clq = map (\l -> let clq = map (\l ->
foldl (\mem f -> if (any (\f' -> isNested (f' ^. clustering_roots) (f ^. clustering_roots)) mem) foldl' (\mem f -> if (any (\f' -> isNested (f' ^. clustering_roots) (f ^. clustering_roots)) mem)
then mem then mem
else else
let fMax = filter (\f' -> not $ isNested (f ^. clustering_roots) (f' ^. clustering_roots)) mem let fMax = filter (\f' -> not $ isNested (f ^. clustering_roots) (f' ^. clustering_roots)) mem
...@@ -355,7 +355,7 @@ toSeriesOfClustering phylo phyloDocs = case (clique $ getConfig phylo) of ...@@ -355,7 +355,7 @@ toSeriesOfClustering phylo phyloDocs = case (clique $ getConfig phylo) of
MaxClique _ thr filterType -> MaxClique _ thr filterType ->
let mcl = map (\(prd,docs) -> let mcl = map (\(prd,docs) ->
let cooc = map round let cooc = map round
$ foldl sumCooc empty $ foldl' sumCooc empty
$ map listToMatrix $ map listToMatrix
$ map (\d -> ngramsToIdx (text d) (getRoots phylo)) docs $ map (\d -> ngramsToIdx (text d) (getRoots phylo)) docs
in (prd, map (\cl -> Clustering cl 0 prd Nothing []) $ getMaxCliques filterType Conditional thr cooc)) in (prd, map (\cl -> Clustering cl 0 prd Nothing []) $ getMaxCliques filterType Conditional thr cooc))
......
...@@ -234,7 +234,7 @@ keepFilled f thr l = if (null $ f thr l) && (not $ null l) ...@@ -234,7 +234,7 @@ keepFilled f thr l = if (null $ f thr l) && (not $ null l)
traceClique :: Map (Date, Date) [Clustering] -> String traceClique :: Map (Date, Date) [Clustering] -> String
traceClique mFis = foldl (\msg cpt -> msg <> show (countSup cpt cliques) <> " (>" <> show (cpt) <> ") " ) "" [1..6] traceClique mFis = foldl' (\msg cpt -> msg <> show (countSup cpt cliques) <> " (>" <> show (cpt) <> ") " ) "" [1..6]
where where
-------------------------------------- --------------------------------------
cliques :: [Double] cliques :: [Double]
...@@ -243,7 +243,7 @@ traceClique mFis = foldl (\msg cpt -> msg <> show (countSup cpt cliques) <> " (> ...@@ -243,7 +243,7 @@ traceClique mFis = foldl (\msg cpt -> msg <> show (countSup cpt cliques) <> " (>
traceSupport :: Map (Date, Date) [Clustering] -> String traceSupport :: Map (Date, Date) [Clustering] -> String
traceSupport mFis = foldl (\msg cpt -> msg <> show (countSup cpt supports) <> " (>" <> show (cpt) <> ") " ) "" [1..6] traceSupport mFis = foldl' (\msg cpt -> msg <> show (countSup cpt supports) <> " (>" <> show (cpt) <> ") " ) "" [1..6]
where where
-------------------------------------- --------------------------------------
supports :: [Double] supports :: [Double]
...@@ -311,7 +311,7 @@ coocToAdjacency cooc = Map.map (\_ -> 1) cooc ...@@ -311,7 +311,7 @@ coocToAdjacency cooc = Map.map (\_ -> 1) cooc
-- | To build the local cooc matrix of each phylogroup -- | To build the local cooc matrix of each phylogroup
ngramsToCooc :: [Int] -> [Cooc] -> Cooc ngramsToCooc :: [Int] -> [Cooc] -> Cooc
ngramsToCooc ngrams coocs = ngramsToCooc ngrams coocs =
let cooc = foldl (\acc cooc' -> sumCooc acc cooc') empty coocs let cooc = foldl' (\acc cooc' -> sumCooc acc cooc') empty coocs
pairs = listToKeys ngrams pairs = listToKeys ngrams
in filterWithKey (\k _ -> elem k pairs) cooc in filterWithKey (\k _ -> elem k pairs) cooc
...@@ -327,7 +327,7 @@ ngramsToCooc ngrams coocs = ...@@ -327,7 +327,7 @@ ngramsToCooc ngrams coocs =
-- Scientometric 22: 155–205. -- Scientometric 22: 155–205.
ngramsToDensity :: [Int] -> [Cooc] -> (Map Int Double) -> Double ngramsToDensity :: [Int] -> [Cooc] -> (Map Int Double) -> Double
ngramsToDensity ngrams coocs rootsCount = ngramsToDensity ngrams coocs rootsCount =
let cooc = foldl (\acc cooc' -> sumCooc acc cooc') empty coocs let cooc = foldl' (\acc cooc' -> sumCooc acc cooc') empty coocs
pairs = listToCombi' ngrams pairs = listToCombi' ngrams
density = map (\(i,j) -> density = map (\(i,j) ->
let nij = findWithDefault 0 (i,j) cooc let nij = findWithDefault 0 (i,j) cooc
...@@ -382,7 +382,7 @@ regimeToDefaultLevel cooc roots ...@@ -382,7 +382,7 @@ regimeToDefaultLevel cooc roots
coocToConfidence :: Phylo -> Cooc coocToConfidence :: Phylo -> Cooc
coocToConfidence phylo = coocToConfidence phylo =
let count = getRootsCount phylo let count = getRootsCount phylo
cooc = foldl (\acc cooc' -> sumCooc acc cooc') empty cooc = foldl' (\acc cooc' -> sumCooc acc cooc') empty
$ elems $ getCoocByDate phylo $ elems $ getCoocByDate phylo
in Map.mapWithKey (\(a,b) w -> confidence a b w count) cooc in Map.mapWithKey (\(a,b) w -> confidence a b w count) cooc
where where
...@@ -749,7 +749,7 @@ branchIdsToSimilarity :: PhyloBranchId -> PhyloBranchId -> Double -> Double -> D ...@@ -749,7 +749,7 @@ branchIdsToSimilarity :: PhyloBranchId -> PhyloBranchId -> Double -> Double -> D
branchIdsToSimilarity id id' thrInit thrStep = thrInit + thrStep * (fromIntegral $ length $ intersectInit [] (snd id) (snd id')) branchIdsToSimilarity id id' thrInit thrStep = thrInit + thrStep * (fromIntegral $ length $ intersectInit [] (snd id) (snd id'))
ngramsInBranches :: [[PhyloGroup]] -> [Int] ngramsInBranches :: [[PhyloGroup]] -> [Int]
ngramsInBranches branches = nub $ foldl (\acc g -> acc ++ (g ^. phylo_groupNgrams)) [] $ concat branches ngramsInBranches branches = nub $ foldl' (\acc g -> acc ++ (g ^. phylo_groupNgrams)) [] $ concat branches
traceMatchSuccess :: Double -> Double -> Double -> [[[PhyloGroup]]] -> [[[PhyloGroup]]] traceMatchSuccess :: Double -> Double -> Double -> [[[PhyloGroup]]] -> [[[PhyloGroup]]]
......
...@@ -31,7 +31,7 @@ import Gargantext.Prelude hiding (empty) ...@@ -31,7 +31,7 @@ import Gargantext.Prelude hiding (empty)
mergeGroups :: [Cooc] -> PhyloGroupId -> Map PhyloGroupId PhyloGroupId -> [PhyloGroup] -> PhyloGroup mergeGroups :: [Cooc] -> PhyloGroupId -> Map PhyloGroupId PhyloGroupId -> [PhyloGroup] -> PhyloGroup
mergeGroups coocs id mapIds childs = mergeGroups coocs id mapIds childs =
let ngrams = (sort . nub . concat) $ map _phylo_groupNgrams childs let ngrams = (sort . nub . concat) $ map _phylo_groupNgrams childs
counts = foldl (\acc count -> unionWith (+) acc count) empty $ map _phylo_groupRootsCount childs counts = foldl' (\acc count -> unionWith (+) acc count) empty $ map _phylo_groupRootsCount childs
in PhyloGroup (fst $ fst id) (_phylo_groupPeriod' $ head' "mergeGroups" childs) in PhyloGroup (fst $ fst id) (_phylo_groupPeriod' $ head' "mergeGroups" childs)
(snd $ fst id) (snd id) "" (snd $ fst id) (snd id) ""
(sum $ map _phylo_groupSupport childs) (sum $ map _phylo_groupSupport childs)
......
...@@ -50,14 +50,14 @@ jaccard inter' union' = ((fromIntegral . length) $ inter') / ((fromIntegral . le ...@@ -50,14 +50,14 @@ jaccard inter' union' = ((fromIntegral . length) $ inter') / ((fromIntegral . le
-- process the inverse sumLog -- process the inverse sumLog
-} -}
sumInvLog' :: Double -> Double -> [Double] -> Double sumInvLog' :: Double -> Double -> [Double] -> Double
sumInvLog' s nb diago = foldl (\mem occ -> mem + (1 / (log (occ + 1/ tan (s * pi / 2)) / log (nb + 1/ tan (s * pi / 2))))) 0 diago sumInvLog' s nb diago = foldl' (\mem occ -> mem + (1 / (log (occ + 1/ tan (s * pi / 2)) / log (nb + 1/ tan (s * pi / 2))))) 0 diago
{- {-
-- process the sumLog -- process the sumLog
-} -}
sumLog' :: Double -> Double -> [Double] -> Double sumLog' :: Double -> Double -> [Double] -> Double
sumLog' s nb diago = foldl (\mem occ -> mem + (log (occ + 1 / tan (s * pi / 2)) / log (nb + 1/ tan (s * pi / 2)))) 0 diago sumLog' s nb diago = foldl' (\mem occ -> mem + (log (occ + 1 / tan (s * pi / 2)) / log (nb + 1/ tan (s * pi / 2)))) 0 diago
{- {-
...@@ -176,7 +176,7 @@ filterPointers' proxi thr pts = filter (\((_,w),_) -> filterSimilarity proxi thr ...@@ -176,7 +176,7 @@ filterPointers' proxi thr pts = filter (\((_,w),_) -> filterSimilarity proxi thr
reduceDiagos :: Map Date Cooc -> Map Int Double reduceDiagos :: Map Date Cooc -> Map Int Double
reduceDiagos diagos = mapKeys (\(k,_) -> k) reduceDiagos diagos = mapKeys (\(k,_) -> k)
$ foldl (\acc diago -> unionWith (+) acc diago) empty (elems diagos) $ foldl' (\acc diago -> unionWith (+) acc diago) empty (elems diagos)
filterPointersByPeriod :: Filiation -> [(Pointer,[Int])] -> [Pointer] filterPointersByPeriod :: Filiation -> [(Pointer,[Int])] -> [Pointer]
filterPointersByPeriod fil pts = filterPointersByPeriod fil pts =
......
...@@ -58,7 +58,7 @@ selectNgramsByDoc lIds dId nt = runOpaQuery (query lIds dId nt) ...@@ -58,7 +58,7 @@ selectNgramsByDoc lIds dId nt = runOpaQuery (query lIds dId nt)
query lIds' dId' nt' = proc () -> do query lIds' dId' nt' = proc () -> do
(ng,nng,cnng) <- join' -< () (ng,nng,cnng) <- join' -< ()
restrict -< foldl (\b lId -> ((pgNodeId lId) .== nng^.nng_node_id) .|| b) (sqlBool True) lIds' restrict -< foldl' (\b lId -> ((pgNodeId lId) .== nng^.nng_node_id) .|| b) (sqlBool True) lIds'
restrict -< (pgNodeId dId') .== cnng^.cnng2_context_id restrict -< (pgNodeId dId') .== cnng^.cnng2_context_id
restrict -< (pgNgramsType nt') .== nng^.nng_ngrams_type restrict -< (pgNgramsType nt') .== nng^.nng_ngrams_type
returnA -< ng^.ngrams_terms returnA -< ng^.ngrams_terms
......
...@@ -40,7 +40,7 @@ import Prelude ...@@ -40,7 +40,7 @@ import Prelude
import Servant.Auth.Client () import Servant.Auth.Client ()
import Servant.Client import Servant.Client
import Servant.Job.Async qualified as ServantAsync import Servant.Job.Async qualified as ServantAsync
import Test.Database.Setup (withTestDBWithTriggers, fakeIniPath, testEnvToPgConnectionInfo, MasterUserEnv) import Test.Database.Setup (withTestDBWithTriggers, fakeIniPath, testEnvToPgConnectionInfo)
import Test.Database.Types import Test.Database.Types
......
...@@ -28,7 +28,7 @@ import Gargantext.Database.Action.User.New (mkNewUser, new_user) ...@@ -28,7 +28,7 @@ import Gargantext.Database.Action.User.New (mkNewUser, new_user)
import Gargantext.Database.Admin.Config (userMaster, corpusMasterName) import Gargantext.Database.Admin.Config (userMaster, corpusMasterName)
import Gargantext.Database.Admin.Trigger.Init (initFirstTriggers, initLastTriggers) import Gargantext.Database.Admin.Trigger.Init (initFirstTriggers, initLastTriggers)
import Gargantext.Database.Admin.Types.Hyperdata (HyperdataCorpus) import Gargantext.Database.Admin.Types.Hyperdata (HyperdataCorpus)
import Gargantext.Database.Admin.Types.Node (NodeId, UserId) import Gargantext.Database.Admin.Types.Node (UserId)
import Gargantext.Database.Query.Table.Node (getOrMkList) import Gargantext.Database.Query.Table.Node (getOrMkList)
import Gargantext.Prelude import Gargantext.Prelude
import Gargantext.Prelude.Config import Gargantext.Prelude.Config
......
...@@ -35,7 +35,7 @@ import Gargantext.Core.Mail.Types (HasMail(..)) ...@@ -35,7 +35,7 @@ import Gargantext.Core.Mail.Types (HasMail(..))
import Gargantext.Core.NLP (HasNLPServer(..)) import Gargantext.Core.NLP (HasNLPServer(..))
import Gargantext.Core.NodeStory import Gargantext.Core.NodeStory
import Gargantext.Core.Types.Individu (Username, GargPassword) import Gargantext.Core.Types.Individu (Username, GargPassword)
import Gargantext.Database.Admin.Types.Node (CorpusId, ListId, NodeId, UserId) import Gargantext.Database.Admin.Types.Node (CorpusId, ListId, UserId)
import Gargantext.Database.Prelude (HasConfig(..), HasConnectionPool(..)) import Gargantext.Database.Prelude (HasConfig(..), HasConnectionPool(..))
import Gargantext.Database.Query.Table.Node.Error import Gargantext.Database.Query.Table.Node.Error
import Gargantext.Prelude.Config import Gargantext.Prelude.Config
......
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