Remove call to `recursiveClustering'`

Also removed some dead and commented code around the edited area.

Note: `recursiveClustering'` was not actually recursive, it just went
one level deeper.

src/Gargantext/Core/Viz/Graph/Bridgeness.hs

@@ -45,42 +45,6 @@ nodeId2comId (ClusterNode i1 i2) = (i1, i2)
 type NodeId        = Int
 type CommunityId   = Int
 
-----------------------------------------------------------------------
--- recursiveClustering : to get more granularity of a given clustering
--- tested with spinglass clustering only (WIP)
-recursiveClustering' :: Partitions' -> Map (Int, Int) Double -> IO [[Set NodeId]]
-recursiveClustering' f mp = do
-  let
-    n :: Double
-    n = fromIntegral $ Set.size
-      $ Set.unions  $ List.concat
-      $ map (\(k1,k2) -> map Set.singleton [k1, k2])
-      $ Map.keys mp
-
-    t :: Int
-    t = round $ 2 * n / sqrt n
-
-  ss <- f mp
-  mapM (\s -> if Set.size s > t then f (removeNodes s mp) else pure [s]) ss
-
-----------------------------------------------------------------------
-recursiveClustering :: Partitions -> Map (Int, Int) Double -> IO [ClusterNode]
-recursiveClustering f mp = do
-  let
-    n :: Double
-    n = fromIntegral $ Set.size
-      $ Set.unions  $ List.concat
-      $ map (\(k1,k2) -> map Set.singleton [k1, k2])
-      $ Map.keys mp
-
-    t :: Int
-    t = round $ 2 * n / sqrt n
-
-  (toSplit,others) <- List.span (\a -> Set.size a > t) <$> clusterNodes2sets <$> f mp
-  cls' <- mapM f $ map (\s -> removeNodes s mp) toSplit
-  pure $ setNodes2clusterNodes $ others <> (List.concat $ map clusterNodes2sets cls')
-
-
 ----------------------------------------------------------------------
 setNodes2clusterNodes :: [Set NodeId] -> [ClusterNode]
 setNodes2clusterNodes ns = List.concat $ map (\(n,ns') -> toCluster n ns') $ zip [1..] ns

src/Gargantext/Core/Viz/Graph/Tools.hs

@@ -30,7 +30,7 @@ import Gargantext.API.Ngrams.Types (NgramsTerm(..))
 import Gargantext.Core.Methods.Similarities (Similarity(..), measure)
 import Gargantext.Core.Statistics ( pcaReduceTo, Dimension(Dimension) )
 import Gargantext.Core.Text.Ngrams (NgramsType(..))
-import Gargantext.Core.Viz.Graph.Bridgeness (bridgeness, Bridgeness(..), Partitions, nodeId2comId, {-recursiveClustering,-} recursiveClustering', setNodes2clusterNodes)
+import Gargantext.Core.Viz.Graph.Bridgeness (bridgeness, Bridgeness(..), Partitions, nodeId2comId, setNodes2clusterNodes)
 import Gargantext.Core.Viz.Graph.Index (createIndices, toIndex, map2mat, mat2map, Index, MatrixShape(..))
 import Gargantext.Core.Viz.Graph.Tools.IGraph (mkGraphUfromEdges, spinglass, spinglass')
 import Gargantext.Core.Viz.Graph.Tools.Infomap (infomap)
@@ -38,7 +38,7 @@ import Gargantext.Core.Viz.Graph.Types (Attributes(..), Edge(..), Graph(..), Mul
 import Gargantext.Core.Viz.Graph.Utils (edgesFilter, nodesFilter)
 import Gargantext.Prelude
 import Graph.BAC.ProxemyOptim qualified as BAC
-import Graph.Types (ClusterNode)
+import Graph.Types (ClusterNode(..))
 import IGraph qualified as Igraph
 import IGraph.Algorithms.Layout qualified as Layout
 import IGraph.Random ( Gen ) -- (Gen(..))
@@ -117,7 +117,7 @@ cooc2graphWith' _doPartitions _bridgenessMethod multi similarity threshold stren
   distanceMap `seq` diag `seq` ti `seq` pure ()
 
   partitions <- if (Map.size distanceMap > 0)
-      then recursiveClustering' (spinglass' 1) distanceMap
+      then spinglass' 1 distanceMap
       else panic $ Text.unwords [ "I can not compute the graph you request"
                                 , "because either the quantity of documents"
                                 , "or the quantity of terms"
@@ -130,30 +130,29 @@ cooc2graphWith' _doPartitions _bridgenessMethod multi similarity threshold stren
 
   let
     !confluence' = BAC.computeConfluences 3 (Map.keys distanceMap) True
-    !bridgeness' = bridgeness (Bridgeness_Recursive partitions 1.0 similarity) distanceMap
-
-  pure $ data2graph multi ti diag bridgeness' confluence' (setNodes2clusterNodes $ List.concat partitions)
-
-{-
-cooc2graphWith' _doPartitions _bridgenessMethod multi similarity@Distributional threshold strength myCooc = do
-  let (distanceMap, diag, ti) = doSimilarityMap similarity threshold strength myCooc
-  distanceMap `seq` diag `seq` ti `seq` pure ()
-
-  partitions <- if (Map.size distanceMap > 0)
-      then recursiveClustering (spinglass 1) distanceMap
-      else panic $ Text.unlines [ "[Gargantext.C.V.Graph.Tools] Similarity Matrix is empty"
-                                , "Maybe you should add more Map Terms in your list"
-                                , "Tutorial: TODO"
-                                ]
-  length partitions `seq` pure ()
-
-  let
-    !confluence' = BAC.computeConfluences 3 (Map.keys distanceMap) True
-    !bridgeness' = bridgeness (Bridgeness_Basic partitions 1.0) distanceMap
-
-  pure $ data2graph multi ti diag bridgeness' confluence' partitions
--}
-
+    !bridgeness' = bridgeness
+      (Bridgeness_Basic (partitionsToClusterNodes partitions) 1.0)
+      distanceMap
+
+  pure $ data2graph multi ti diag bridgeness' confluence' (setNodes2clusterNodes partitions)
+
+
+-- | A converter from the partition type returned by `spinglass'`
+-- to the partition type required by `bridgeness`
+partitionsToClusterNodes :: [Set Int] -> [ClusterNode]
+partitionsToClusterNodes setlist =
+  setlist                                                &
+  -- Convert sets to lists:
+  fmap toList                                            &
+  -- Assign an integer index to each cluster:
+  zip [1 ..]                                             &
+  -- Attach cluster IDs to individual nodes instead to whole clusters
+  fmap (\(id, clusterIds) -> zip (repeat id) clusterIds) &
+  -- Flatten list of clusters of nodes labeled by cluster indices
+  -- into a list of labeled nodes:
+  join                                                   &
+  -- Turn pairs into `ClusterNode`s
+  fmap (\(clusterId, nodeId) -> ClusterNode nodeId clusterId)
 
 
 type Reverse = Bool