Some "automatic" refactoring

Reduce code duplication and simplify a few things.

The changes in this commit were made without relying on any knowledge
about what the code means or does; the changes should be understandable
even without knowing the project.

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

@@ -108,64 +108,40 @@ partitionsToClusterNodes setlist = setlist
   & fmap (\(clusterId, nodeId) -> ClusterNode nodeId clusterId) -- Turn pairs into `ClusterNode`s
 
 doSimilarityMap :: Similarity
-              -> Threshold
-              -> Strength
-              -> HashMap (NgramsTerm, NgramsTerm) Int
-              -> ( Map (Int,Int) Double
-                 , Map (Index, Index) Int
-                 , Map NgramsTerm Index
-                 )
-
-doSimilarityMap Conditional threshold strength myCooc = (distanceMap, toIndex ti myCooc', ti)
+                -> Threshold
+                -> Strength
+                -> HashMap (NgramsTerm, NgramsTerm) Int -- cooccurrence map
+                -> ( Map (Int,Int) Double   -- weight map
+                   , Map (Index, Index) Int -- cooccurrence map
+                   , Map NgramsTerm Index   -- ???
+                   )
+doSimilarityMap similarityType threshold strength coocMap =
+  (weightMap, toIndex ti coocMap', ti)
   where
-    myCooc' = Map.fromList $ HashMap.toList myCooc
-
-    (_diag, theMatrix) = Map.partitionWithKey (\(x,y) _ -> x == y)
-                       $ Map.fromList
-                       $ HashMap.toList myCooc
-
-    (ti, _it) = createIndices theMatrix
-    tiSize  = Map.size ti
-
-    similarities = (\m -> m `seq` m)
-                 $ (\m -> m `seq` measure Conditional m)
-                 $ (\m -> m `seq` map2mat Square 0 tiSize m)
-                 $ theMatrix `seq` toIndex ti theMatrix
-
-    links = round (let n :: Double = fromIntegral (Map.size ti) in 10 * n * (log n)^(2::Int))
-    distanceMap = Map.fromList
-                $ List.take links
-                $ (if strength == Weak then List.reverse else identity)
-                $ List.sortOn snd
-                $ Map.toList
-                $ Map.filter (> threshold)
-                $ similarities `seq` mat2map similarities
-
-doSimilarityMap distriType threshold strength myCooc = (distanceMap, toIndex ti diag, ti)
-  where
-    -- TODO remove below
-    (diag, theMatrix) = Map.partitionWithKey (\(x,y) _ -> x == y)
+    coocMap' = case similarityType of
+      Conditional -> Map.fromList $ HashMap.toList coocMap
+      Distributional -> diag
+    (diag, theMatrix) = Map.partitionWithKey (\(x, y) _ -> x == y)
                       $ Map.fromList
-                      $ HashMap.toList myCooc
-
+                      $ HashMap.toList coocMap
     (ti, _it) = createIndices theMatrix
-    tiSize  = Map.size ti
-
-    similarities = (\m -> m `seq` m)
-                 $ (\m -> m `seq` measure distriType m)
+    similarities = (\m -> m `seq` measure similarityType m)
                  $ (\m -> m `seq` map2mat Square 0 tiSize m)
                  $ theMatrix `seq` toIndex ti theMatrix
-
-    links = round (let n :: Double = fromIntegral tiSize in n * (log n)^(2::Int))
-
-    distanceMap = Map.fromList
-                $ List.take links
-                $ (if strength == Weak then List.reverse else identity)
-                $ List.sortOn snd
-                $ Map.toList
-                $ edgesFilter
-                $ (\m -> m `seq` Map.filter (> threshold) m)
-                $ similarities `seq` mat2map similarities
+    tiSize = Map.size ti
+    links = let n = fromIntegral $ Map.size ti :: Double
+                factor = if similarityType == Conditional then 10 else 1
+            in round $ factor * n * log n^(2::Int)
+    filterMap = case similarityType of
+      Conditional -> Map.filter (> threshold)
+      Distributional -> edgesFilter . (\m -> m `seq` Map.filter (> threshold) m)
+    weightMap = Map.fromList
+              $ List.take links
+              $ (if strength == Weak then List.reverse else identity)
+              $ List.sortOn snd
+              $ Map.toList
+              $ filterMap
+              $ similarities `seq` mat2map similarities
 
 ----------------------------------------------------------
 -- | From data to Graph