[FIX] Order 2 : ok

src/Gargantext/Core/Methods/Matrix/Accelerate/Utils.hs

@@ -423,9 +423,9 @@ theMatrixInt n = matrix n (dataMatrix n)
                                  , 0, 3, 4
                                  ]
                  | (P.==) x 4 =  [ 4, 1, 2, 1
-                                 , 1, 4, 0, 0
-                                 , 2, 0, 3, 3
-                                 , 1, 0, 3, 3
+                                 , 1, 1, 0, 0
+                                 , 2, 0, 5, 3
+                                 , 1, 0, 3, 4
                                  ]
 
 

src/Gargantext/Core/Methods/Similarities/Accelerate/Distributional.hs

@@ -169,8 +169,8 @@ distributional m' = run $ result
     result = termDivNan z_1 z_2
 
 logDistributional2 :: Matrix Int -> Matrix Double
-logDistributional2 m = trace ("logDistributional, dim=" `mappend` show n) . run
-                    -- $ diagNull n
+logDistributional2 m = trace ("logDistributional2, dim=" `mappend` show n) . run
+                    $ diagNull n
                     $ matMaxMini
                     $ logDistributional' n m
   where
@@ -263,7 +263,7 @@ logDistributional' n m' = trace ("logDistributional'") result
 --
 
 logDistributional :: Matrix Int -> Matrix Double
-logDistributional m' = run result
+logDistributional m' = run $ diagNull n $ result
  where
     m = map fromIntegral $ use m'
     n = dim m'

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

@@ -25,7 +25,7 @@ import Gargantext.API.Ngrams.Types (NgramsTerm(..))
 import Gargantext.Core.Methods.Similarities (Similarity(..), measure)
 -- import Gargantext.Core.Methods.Similarities.Conditional (conditional)
 import Gargantext.Core.Statistics
-import Gargantext.Core.Viz.Graph.Bridgeness (bridgeness, Bridgeness(..), Partitions, nodeId2comId, recursiveClustering, recursiveClustering', setNodes2clusterNodes)
+import Gargantext.Core.Viz.Graph.Bridgeness (bridgeness, Bridgeness(..), Partitions, nodeId2comId, {-recursiveClustering,-} recursiveClustering', 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)
@@ -117,7 +117,7 @@ cooc2graphWith' :: Partitions
                 -> Strength
                 -> HashMap (NgramsTerm, NgramsTerm) Int
                 -> IO Graph
-cooc2graphWith' _doPartitions _bridgenessMethod multi similarity@Conditional threshold strength myCooc = do
+cooc2graphWith' _doPartitions _bridgenessMethod multi similarity threshold strength myCooc = do
   let (distanceMap, diag, ti) = doSimilarityMap similarity threshold strength myCooc
   distanceMap `seq` diag `seq` ti `seq` return ()
 
@@ -135,6 +135,7 @@ cooc2graphWith' _doPartitions _bridgenessMethod multi similarity@Conditional thr
 
   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` return ()
@@ -152,7 +153,7 @@ cooc2graphWith' _doPartitions _bridgenessMethod multi similarity@Distributional
     !bridgeness' = bridgeness (Bridgeness_Basic partitions 1.0) distanceMap
 
   pure $ data2graph multi ti diag bridgeness' confluence' partitions
-
+-}