Merge branch 'dev' into dev-dashoard-charts

src/Gargantext/API.hs

@@ -319,8 +319,8 @@ type GargPrivateAPI' =
 
 type API = SwaggerAPI
        :<|> FrontEndAPI
-       :<|> GargAPI
        :<|> Get '[HTML] Html
+       :<|> GargAPI
 
 -- This is the concrete monad. It needs to be used as little as possible,
 -- instead, prefer GargServer, GargServerT, GargServerC.
@@ -341,8 +341,8 @@ server env = do
   -- orchestrator <- scrapyOrchestrator env
   pure $  schemaUiServer swaggerDoc
      :<|> frontEndServer
-     :<|> hoistServerWithContext (Proxy :: Proxy GargAPI) (Proxy :: Proxy AuthContext) transform serverGargAPI
      :<|> serverStatic
+     :<|> hoistServerWithContext (Proxy :: Proxy GargAPI) (Proxy :: Proxy AuthContext) transform serverGargAPI
   where
     transform :: forall a. GargServerM env GargError a -> Handler a
     transform = Handler . withExceptT showAsServantErr . (`runReaderT` env)

src/Gargantext/Viz/Graph/API.hs

@@ -24,7 +24,7 @@ Portability : POSIX
 module Gargantext.Viz.Graph.API
   where
 
-import Debug.Trace (trace)
+-- import Debug.Trace (trace)
 import Control.Lens (set, (^.), _Just, (^?))
 import Control.Monad.IO.Class (liftIO)
 import Data.Maybe (Maybe(..))
@@ -94,7 +94,7 @@ getGraph uId nId = do
                        graph'' <- computeGraph cId NgramsTerms repo
                        _ <- updateHyperdata nId (HyperdataGraph $ Just graph'')
                        pure graph''
-  pure $ trace ("salut" <> show g) $ g
+  pure {- $ trace (show g) $ -} g
 
 
 -- TODO use Database Monad only here ?

src/Gargantext/Viz/Graph/MaxClique.hs

@@ -63,6 +63,25 @@ import Gargantext.Viz.Graph.FGL (Graph_Undirected, degree, neighbors, mkGraphUfr
 type Graph = Graph_Undirected
 type Neighbor = Node
 
+{-
+-- prefiltre
+-- Texte -> Ngrams
+-- Map Terms
+-- pré-filtre: spécifiques
+-- soit conditionnelle, matrice spécifiques
+-- combien de voisins maximum avant le calcul de cliques (les génériques)
+-- calcul maxcliques
+-- calcul de densité/inclusion si graph gros
+-- 
+-- FIS: ensemble de termes un niveau du document
+-- maxclique: ensemble de termes au niveau de l'ensemble du document
+
+type Density = Double
+maxCliques' :: [[Text]] -> Map (Set Ngrams) Density
+maxCliques' = undefined
+-}
+
+
 maxCliques :: Graph -> [[Node]]
 maxCliques g = map (\n -> subMaxCliques g (n:ns)) ns & concat & takeMax
   where

src/Gargantext/Viz/Graph/Tools.hs

@@ -53,14 +53,14 @@ cooc2graph threshold myCooc = do
         where
           (as, bs) = List.unzip $ Map.keys distanceMap
           n' = Set.size $ Set.fromList $ as <> bs
-      ClustersParams rivers level = trace ("nodesApprox: " <> show nodesApprox) $ clustersParams nodesApprox
+      ClustersParams rivers level = {-trace ("nodesApprox: " <> show nodesApprox) $-} clustersParams nodesApprox
 
 
   partitions <- case Map.size distanceMap > 0 of
     True  -> trace ("level" <> show level) $ cLouvain level distanceMap
     False -> panic "Text.Flow: DistanceMap is empty"
 
-  let bridgeness' = trace ("rivers: " <> show rivers) $ bridgeness rivers partitions distanceMap
+  let bridgeness' = {-trace ("rivers: " <> show rivers) $-} bridgeness rivers partitions distanceMap
   let confluence' = confluence (Map.keys bridgeness') 3 True False
 
   data2graph (Map.toList ti) myCooc' bridgeness' confluence' partitions
@@ -72,14 +72,14 @@ data ClustersParams = ClustersParams { bridgness :: Double
                                      } deriving (Show)
 
 clustersParams :: Int -> ClustersParams
-clustersParams x = ClustersParams (fromIntegral x) y
-  where
-    y | x < 100  = "0.01"
-      | x < 350  = "0.01"
-      | x < 500  = "0.01"
-      | x < 1000 = "0.1"
+clustersParams x = ClustersParams (fromIntegral x) "0.00000001" -- y
+  {- where
+    y | x < 100  = "0.000001"
+      | x < 350  = "0.000001"
+      | x < 500  = "0.000001"
+      | x < 1000 = "0.000001"
       | otherwise = "1"
-
+ -}
 
 ----------------------------------------------------------
 -- | From data to Graph