[CLEAN] Metrics

src/Gargantext/Database/Action/Metrics/NgramsByNode.hs

@@ -19,14 +19,12 @@ module Gargantext.Database.Action.Metrics.NgramsByNode
 import Data.Map.Strict (Map, fromListWith, elems, toList, fromList)
 import Data.Map.Strict.Patch (PatchMap, Replace, diff)
 import Data.Set (Set)
-import qualified Data.Ord as DO (Down(..))
 import Data.Text (Text)
 import Data.Tuple.Extra (second, swap)
 import Database.PostgreSQL.Simple.SqlQQ (sql)
 import Database.PostgreSQL.Simple.Types (Values(..), QualifiedIdentifier(..))
 import Debug.Trace (trace)
 import Gargantext.Core (Lang(..))
-import Gargantext.Core.Types (Ordering(..))
 import Gargantext.Database.Admin.Config (nodeTypeId)
 import Gargantext.Database.Admin.Types.Node -- (ListId, CorpusId, NodeId)
 import Gargantext.Database.Prelude (Cmd, runPGSQuery)
@@ -58,12 +56,6 @@ ngramsGroup l _m _n = Text.intercalate " "
                   . Text.replace "-" " "
 
 
-sortTficf :: Ordering
-          -> (Map Text (Double, Set Text))
-          -> [   (Text,(Double, Set Text))]
-sortTficf Down = List.sortOn (DO.Down . fst . snd) . toList
-sortTficf Up   = List.sortOn (fst . snd) . toList
-
 
 getTficf :: UserCorpusId
          -> MasterCorpusId

src/Gargantext/Text/List.hs

@@ -21,7 +21,8 @@ import Gargantext.API.Ngrams (NgramsElement, mkNgramsElement, RootParent(..), mS
 -- import Gargantext.API.Ngrams.Tools (getCoocByNgrams', Diagonal(..))
 import Gargantext.Core (Lang(..))
 import Gargantext.Core.Types (ListType(..), MasterCorpusId, UserCorpusId, Ordering(..))
-import Gargantext.Database.Action.Metrics.NgramsByNode (getTficf, sortTficf, ngramsGroup, getNodesByNgramsUser, groupNodesByNgramsWith)
+import Gargantext.Database.Action.Metrics.NgramsByNode (getTficf, ngramsGroup, getNodesByNgramsUser, groupNodesByNgramsWith)
+import Gargantext.Text.Metrics.TFICF (sortTficf)
 import Gargantext.Database.Prelude (Cmd)
 import Gargantext.Database.Schema.Ngrams (NgramsType(..))
 import Gargantext.Prelude
@@ -199,7 +200,6 @@ toGargList stop l n = case stop n of
     False -> (l, n)
 
 
-
 isStopTerm :: StopSize -> Text -> Bool
 isStopTerm (StopSize n) x = Text.length x < n || any isStopChar (Text.unpack x)
   where

src/Gargantext/Text/Metrics/TFICF.hs

@@ -19,14 +19,20 @@ module Gargantext.Text.Metrics.TFICF ( TFICF
                                      , Total(..)
                                      , Count(..)
                                      , tficf
+                                     , sortTficf
                                      )
   where
 
 import Data.Text (Text)
 import Gargantext.Prelude
+import Data.Set (Set)
+import Gargantext.Core.Types (Ordering(..))
+import Data.Map.Strict (Map, toList)
+import qualified Data.Ord as DO (Down(..))
+import qualified Data.List as List
 
 path :: Text
-path = "Gargantext.Text.Metrics.TFICF"
+path = "[G.T.Metrics.TFICF]"
 
 type TFICF = Double
 
@@ -47,3 +53,9 @@ tficf (TficfInfra (Count ic) (Total it) )
 tficf _ _ = panic $ "[ERR]" <> path <> "Undefined for these contexts"
 
 
+sortTficf :: Ordering
+          -> (Map Text (Double, Set Text))
+          -> [   (Text,(Double, Set Text))]
+sortTficf Down = List.sortOn (DO.Down . fst . snd) . toList
+sortTficf Up   = List.sortOn (fst . snd) . toList
+