Merge branch 'dev' into dev-wikidata

src/Gargantext/Core/Text/List.hs

@@ -35,7 +35,7 @@ import Gargantext.Core.Text.Metrics (scored', Scored(..), scored_speExc, scored_
 import Gargantext.Core.Types (ListType(..), MasterCorpusId, UserCorpusId)
 import Gargantext.Core.Types.Individu (User(..))
 import Gargantext.Database.Action.Metrics.NgramsByNode (getNodesByNgramsUser, getNodesByNgramsOnlyUser)
-import Gargantext.Database.Action.Metrics.TFICF (getScore) -- (getTficf_withSample, getTficf_withSample')
+import Gargantext.Database.Action.Metrics.TFICF (getTficf_withSample)
 import Gargantext.Database.Admin.Types.Node (NodeId)
 import Gargantext.Database.Prelude (CmdM)
 import Gargantext.Database.Query.Table.Ngrams (text2ngrams)
@@ -160,7 +160,7 @@ buildNgramsTermsList user uCid mCid mfslw groupParams (nt, _mapListSize)= do
 -- Filter 0 With Double
 -- Computing global speGen score
   printDebug "[buldNgramsTermsList: Sample List] / start" nt
-  allTerms :: HashMap NgramsTerm Double <- getScore uCid mCid nt
+  allTerms :: HashMap NgramsTerm Double <- getTficf_withSample uCid mCid nt
   printDebug "[buldNgramsTermsList: Sample List / end]" nt
 
   printDebug "[buldNgramsTermsList: Flow Social List / start]" nt

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

@@ -21,7 +21,7 @@ import qualified Data.HashMap.Strict as HM
 import Data.Maybe (fromMaybe)
 import Gargantext.Core
 import Gargantext.Core.Text.Metrics.TFICF
-import Gargantext.Database.Action.Metrics.NgramsByNode (getNodesByNgramsUser{-, getOccByNgramsOnlyFast-}, getOccByNgramsOnlyFast_withSample)
+import Gargantext.Database.Action.Metrics.NgramsByNode (getNodesByNgramsUser, getOccByNgramsOnlyFast, getOccByNgramsOnlyFast_withSample)
 import Gargantext.Database.Admin.Types.Node -- (ListId, CorpusId, NodeId)
 import Gargantext.Database.Prelude (Cmd)
 import Gargantext.Database.Query.Table.NodeNode (selectCountDocs)
@@ -30,7 +30,6 @@ import Gargantext.API.Ngrams.Types
 import Gargantext.Prelude
 import qualified Data.Set as Set
 
-{-
 getTficf :: HasDBid NodeType 
          => UserCorpusId
          -> MasterCorpusId
@@ -53,20 +52,6 @@ getTficf cId mId nt = do
             (TficfSupra (Count $ fromMaybe 0 $ HM.lookup t mapTextDoubleGlobal)
                         (Total $ fromIntegral countGlobal))
     ) mapTextDoubleLocal
--}
-
-
-
-getScore :: HasDBid NodeType 
-         => UserCorpusId
-         -> MasterCorpusId
-         -> NgramsType
-         -> Cmd err (HashMap NgramsTerm Double)
-getScore cId _mId nt =
-  HM.filter (> 1)
-     <$> HM.map (fromIntegral . Set.size)
-     <$> getNodesByNgramsUser cId nt
-
 
 
 getTficf_withSample :: HasDBid NodeType