Merge branch 'dev-refact-graph' into dev

bin/build

 #!/bin/bash
 
-stack build --profile # --test # --haddock
+stack build # --profile # --test # --haddock

bin/install

 #!/bin/bash
 
-stack install --profile # --test --haddock
+stack install #--profile # --test --haddock

src/Gargantext/Viz/Graph.hs

@@ -116,8 +116,8 @@ instance ToSchema GraphMetadata where
 makeLenses ''GraphMetadata
 
 
-data Graph = Graph { _graph_nodes :: [Node]
-                   , _graph_edges :: [Edge]
+data Graph = Graph { _graph_nodes    :: [Node]
+                   , _graph_edges    :: [Edge]
                    , _graph_metadata :: Maybe GraphMetadata
                    }
   deriving (Show, Generic)

src/Gargantext/Viz/Graph/API.hs

@@ -149,7 +149,7 @@ computeGraph cId d nt repo = do
 
   -- TODO split diagonal
   myCooc <- Map.filter (>1)
-         <$> getCoocByNgrams (Diagonal False)
+         <$> getCoocByNgrams (Diagonal True)
          <$> groupNodesByNgrams ngs
          <$> getNodesByNgramsOnlyUser cId (lIds <> [lId]) nt (Map.keys ngs)
 

src/Gargantext/Viz/Graph/Tools.hs

@@ -60,7 +60,9 @@ cooc2graph distance threshold myCooc = do
   let
     (ti, _) = createIndices myCooc
     myCooc' = toIndex ti myCooc
-    matCooc = map2mat 0 (Map.size ti) $ Map.filter (> 1) myCooc'
+    matCooc = map2mat 0 (Map.size ti)
+            $ Map.filterWithKey (\(a,b) _ -> a /= b) 
+            $ Map.filter (> 1) myCooc'
     distanceMat = measure distance matCooc
     distanceMap = Map.filter (> threshold) $ mat2map distanceMat