[TYPES] Terms and Human Lang types fusion.

src/Gargantext/Pipeline.hs

@@ -55,15 +55,18 @@ workflow lang path = do
   -- Text  <- IO Text <- FilePath
   text     <- readFile path
 
-  -- context :: Text -> [Text]
   let contexts = splitBy (Sentences 5) text
+  -- Context :: Text -> [Text]
+  -- Contexts = Paragraphs n | Sentences n | Chars n
 
-  myterms <- extractTerms Mono lang contexts
-  -- myterms <- extractTerms (Mono lang) contexts # filter (\t -> not . elem t stopList)
-  --                                              # groupBy (Stem|GroupList)
+  myterms <- extractTerms (Mono lang) contexts
+  -- myterms # filter (\t -> not . elem t stopList)
+  --         # groupBy (Stem|GroupList)
   printDebug "myterms" (sum $ map length myterms)
 
   -- Bulding the map list
+  -- compute copresences of terms
+  -- Cooc = Map (Term, Term) Int
   let myCooc1 = cooc myterms
   printDebug "myCooc1" (M.size myCooc1)
 

src/Gargantext/Text/Metrics.hs

@@ -180,7 +180,7 @@ metrics_sentences_Test = metrics_sentences == metrics_sentences'
 -}
 
 metrics_terms :: IO [[Terms]]
-metrics_terms = mapM (terms MonoMulti EN) $ splitBy (Sentences 0) metrics_text
+metrics_terms = mapM (terms (MonoMulti EN)) $ splitBy (Sentences 0) metrics_text
 
 -- | Occurrences
 {-

src/Gargantext/Text/Terms.hs

@@ -42,23 +42,23 @@ import Gargantext.Core.Types
 import Gargantext.Text.Terms.Multi (multiterms)
 import Gargantext.Text.Terms.Mono  (monoterms')
 
-data TermType = Mono | Multi | MonoMulti
+data TermType lang = Mono lang | Multi lang | MonoMulti lang
 
 -- remove Stop Words
 -- map (filter (\t -> not . elem t)) $ 
 ------------------------------------------------------------------------
 -- | Sugar to extract terms from text (hiddeng mapM from end user).
-extractTerms :: Traversable t => TermType -> Lang -> t Text -> IO (t [Terms])
-extractTerms termType lang = mapM (terms termType lang)
+extractTerms :: Traversable t => TermType Lang -> t Text -> IO (t [Terms])
+extractTerms termTypeLang = mapM (terms termTypeLang)
 ------------------------------------------------------------------------
 -- | Terms from Text
 -- Mono : mono terms
 -- Multi : multi terms
 -- MonoMulti : mono and multi
 -- TODO : multi terms should exclude mono (intersection is not empty yet)
-terms :: TermType -> Lang -> Text -> IO [Terms]
-terms Mono  lang txt     = pure $ monoterms' lang txt
-terms Multi lang txt     = multiterms lang txt
-terms MonoMulti lang txt = terms Multi lang txt
+terms :: TermType Lang -> Text -> IO [Terms]
+terms (Mono      lang) txt = pure $ monoterms' lang txt
+terms (Multi     lang) txt = multiterms lang txt
+terms (MonoMulti lang) txt = terms (Multi lang) txt
 ------------------------------------------------------------------------