Merge branch 'dev' into 303-dev-node-story-refactoring

CHANGELOG.md

+## Version 0.0.6.9.9.9.6
+
+* [FIX] Graph Order 2B to remove Order 2A.
+
 ## Version 0.0.6.9.9.9.5
 
 * [BACK][CI][Improving CI](https://gitlab.iscpif.fr/gargantext/haskell-gargantext/merge_requests/247)

gargantext.cabal

@@ -5,7 +5,7 @@ cabal-version: 2.0
 -- see: https://github.com/sol/hpack
 
 name:           gargantext
-version: 0.0.6.9.9.9.5
+version: 0.0.6.9.9.9.6
 synopsis:       Search, map, share
 description:    Please see README.md
 category:       Data

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

@@ -203,8 +203,8 @@ logDistributional' o n m' = trace ("logDistributional'") result
     -- Matrix nxn. mi = [m_{i,j}]_{i,j} where 
     -- m_{i,j} = 0 if n_{i,j} = 0 or i = j, 
     -- m_{i,j} = log(to * n_{i,j} / s_{i,j}) otherwise.
-    mi = (.*) (matrixEye n) 
-        (map (lift1 (\x -> cond (x == 0) 0 (log (o + x * to)))) ((./) m ss))
+    mi = (.*) (matrixEye n)
+              (map (lift1 (\x -> let x' = o + x * to in cond (x' < 1) 0 (log x'))) ((./) m ss))
     -- mi_nnz :: Int
     -- mi_nnz = flip indexArray Z . run $
     --   foldAll (+) 0 $ map (\a -> ifThenElse (abs a < 10^(-6 :: Exp Int)) 0 1) mi