Commit c8c1e536 authored by Alexandre Delanoë's avatar Alexandre Delanoë

[FIX] merge with local stashed changes

parent fcf20477
...@@ -125,6 +125,17 @@ buildNgramsTermsList user uCid mCid groupParams = do ...@@ -125,6 +125,17 @@ buildNgramsTermsList user uCid mCid groupParams = do
socialLists <- flowSocialList user NgramsTerms (Set.fromList $ map fst allTerms) socialLists <- flowSocialList user NgramsTerms (Set.fromList $ map fst allTerms)
-- printDebug "\n * socialLists * \n" socialLists -- printDebug "\n * socialLists * \n" socialLists
printDebug "\n * socialLists * \n" socialLists
let
socialStop = fromMaybe Set.empty $ Map.lookup StopTerm socialLists
_socialMap = fromMaybe Set.empty $ Map.lookup MapTerm socialLists
_socialCand = fromMaybe Set.empty $ Map.lookup CandidateTerm socialLists
-- stopTerms ignored for now (need to be tagged already)
(stopTerms, candidateTerms) = List.partition ((\t -> Set.member t socialStop) . fst) allTerms
-- (mapTerms, candidateTerms) = List.partition ((\t -> Set.member t socialMap ) . fst) allTerms
printDebug "stopTerms" stopTerms
-- Grouping the ngrams and keeping the maximum score for label -- Grouping the ngrams and keeping the maximum score for label
let grouped = toGroupedText (ngramsGroup groupParams) identity (const Set.empty) (const Set.empty) allTerms let grouped = toGroupedText (ngramsGroup groupParams) identity (const Set.empty) (const Set.empty) allTerms
......
...@@ -174,8 +174,8 @@ toMapTextListType m = Map.fromListWith (<>) ...@@ -174,8 +174,8 @@ toMapTextListType m = Map.fromListWith (<>)
type Parent = Text type Parent = Text
parentUnionsMerge :: (Ord a, Ord b, Num c) parentUnionsMerge :: (Ord a, Ord b, Num c)
=> [Map a (Map b c)] => [Map a (Map b c)]
-> Map a (Map b c) -> Map a (Map b c)
parentUnionsMerge = Map.unionsWith (Map.unionWith (+)) parentUnionsMerge = Map.unionsWith (Map.unionWith (+))
-- This Parent union is specific -- This Parent union is specific
......
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