add 'reverse index' for clusters to 'Clust' result type

app/Main.hs

@@ -54,7 +54,7 @@ main = do
         Just d -> d
         _      -> Prelude.error "beta must be a Double"
   setupEnv fpin >>= \g -> do
-    let (Clust clusts dico score) = withG g (\fg -> clusteringOptim 3 fg beta gc)
+    let (Clust clusts dico _ score) = withG g (\fg -> clusteringOptim 3 fg beta gc)
         clusts' = Prelude.map (sort . Prelude.map (lkp dico) . IntSet.toList)
                 $ sortBy (\a b -> flipOrd $ comparing IntSet.size a b)
                 $ IntMap.elems clusts

src/Graph/BAC/ProxemyOptim.hs

@@ -32,6 +32,7 @@ Gaume.
 #-}
 
 {-# LANGUAGE AllowAmbiguousTypes #-}
+{-# LANGUAGE TupleSections #-}
 module Graph.BAC.ProxemyOptim
   where
 
@@ -75,9 +76,12 @@ clusteringOptim :: forall n a b. KnownNat n
                 -> Clust a
 clusteringOptim l fg@(FiniteGraph g) beta gc =
   case runClustering gc beta adj prox sorted_edges of
-    (clusts, d) -> Clust clusts idx d
+    (clusts, d) -> Clust clusts dico (index clusts) d
   where
-    !idx = Dict.fromList (DGI.labNodes g)
+    dico = Dict.fromList (DGI.labNodes g)
+    index clusts = Dict.foldMapWithKey
+      (\clustN is -> Dict.fromList $ map (,clustN) (IntSet.toList is))
+      clusts
     !adj = graphMatrix fg True
     !tra = transition adj
     !prox = proxemie l tra
@@ -405,8 +409,9 @@ clusteringCollector beta adj prox mclust = do
 
 data Clust a = Clust
   { cparts :: !(Dict IntSet)
-  , cindex :: !(Dict a)
-  , cscore :: {-# UNPACK #-} !Double
+  , cdico  :: (Dict a)
+  , cindex :: (Dict Int)
+  , cscore :: !Double
   } deriving (Show, Eq)
 
 runClustering