[FIX] merge wikidata branch

package.yaml

@@ -147,6 +147,7 @@ library:
   - full-text-search
   - fullstop
   - gargantext-prelude
+  - gargantext-graph >= 0.1.0.0
   - graphviz
   - hashable
   - haskell-igraph

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

@@ -24,7 +24,7 @@ import Data.Maybe (catMaybes)
 import Data.Ord (Down(..))
 import Gargantext.Prelude
 import qualified Data.Map as DM
-import Gargantext.Core.Viz.Graph.Tools.IGraph (ClusterNode(..))
+import Graph.Types (ClusterNode(..))
 
 ----------------------------------------------------------------------
 type Partitions a = Map (Int, Int) Double -> IO [a]

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

@@ -27,8 +27,9 @@ import Gargantext.Core.Statistics
 import Gargantext.Core.Viz.Graph
 import Gargantext.Core.Viz.Graph.Bridgeness (bridgeness, Partitions, ToComId(..))
 import Gargantext.Core.Viz.Graph.Index (createIndices, toIndex, map2mat, mat2map, Index, MatrixShape(..))
-import Gargantext.Core.Viz.Graph.Tools.IGraph (mkGraphUfromEdges, spinglass, ClusterNode)
+import Gargantext.Core.Viz.Graph.Tools.IGraph (mkGraphUfromEdges, spinglass)
 import Gargantext.Prelude
+import Graph.Types (ClusterNode)
 import IGraph.Random -- (Gen(..))
 import qualified Data.HashMap.Strict      as HashMap
 import qualified Data.List                as List

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

@@ -20,6 +20,7 @@ import Data.Singletons (SingI)
 import IGraph hiding (mkGraph, neighbors, edges, nodes, Node, Graph)
 import Protolude
 import Gargantext.Core.Viz.Graph.Index
+import Graph.Types
 import qualified Data.List                   as List
 import qualified IGraph                      as IG
 import qualified IGraph.Algorithms.Clique    as IG
@@ -82,10 +83,6 @@ partitions_spinglass' s g = do
   IG.findCommunity g Nothing Nothing IG.spinglass gen
 
 
-data ClusterNode = ClusterNode { cl_node_id :: Int
-                               , cl_community_id :: Int
-                               }
-
 toClusterNode :: [[Int]] -> [ClusterNode]
 toClusterNode ns = List.concat
                  $ map (\(cId, ns') -> map (\n -> ClusterNode n cId) ns')

stack.yaml

@@ -4,7 +4,7 @@ flags: {}
 extra-package-dbs: []
 packages:
 - .
-#- 'deps/patches-class'
+- 'deps/gargantext-graph'
 #- 'deps/patches-map'
 #- 'deps/accelerate'
 #- 'deps/accelerate-utility'
@@ -30,6 +30,9 @@ extra-deps:
 - #git: https://gitlab.iscpif.fr/gargantext/haskell-gargantext-prelude.git
   git: https://gitlab.iscpif.fr/cgenie/haskell-gargantext-prelude.git
   commit: 35b09629a658fc16cc9ff63e7591e58511cd98a7
+  #git: ssh://git@gitlab.iscpif.fr:20022/gargantext/gargantext-graph.git
+  #- git: ssh://gitolite3@delanoe.org/gargantext-graph
+  #commit: a74738d75f4385145df781408c610719e0a9b50f
   # Data Mining Libs
 - git: https://github.com/delanoe/data-time-segment.git
   commit: 10a416b9f6c443866b36479c3441ebb3bcdeb7ef
@@ -88,6 +91,17 @@ extra-deps:
 - git: https://github.com/rspeer/wikiparsec.git
   commit: 9637a82344bb70f7fa8f02e75db3c081ccd434ce
 
+  # Gargantext-graph
+- eigen-3.3.7.0@sha256:7c24a86426b238e02ba0ac2179cc44997518b443a13828ed7a791fe49a6dffa5,82060
+- git: https://github.com/alpmestan/sparse-linear.git
+  commit: bc6ca8058077b0b5702ea4b88bd4189cfcad267a
+  subdirs:
+    - sparse-linear
+- git: https://github.com/alpmestan/hmatrix.git
+  commit: b9fca8beee0f23c17a6b2001ec834d071709e6e7
+  subdirs:
+    - packages/base
+
       # Others dependencies (using stack resolver)
 - constraints-extras-0.3.1.0@sha256:12016ebb91ad5ed2c82bf7e48c6bd6947d164d33c9dca5ac3965de1bb6c780c0,1777
 - KMP-0.2.0.0@sha256:6dfbac03ef00ebd9347234732cb86a40f62ab5a80c0cc6bedb8eb51766f7df28,2562
@@ -120,3 +134,8 @@ extra-deps:
 # wikipedia crawl
 - taggy-lens-0.1.2@sha256:091ca81d02bd3d7fb493dce0148e1a38f25eb178a1ebd751043a23239e5e3265,3009
 - taggy-0.2.1@sha256:7bc55ddba178971dc6052163597f0445a0a2b5b0ca0e84ce651d53d722e3c265,4662
+
+ghc-options:
+  hmatrix: -O2 -fsimpl-tick-factor=10000 -fdicts-cheap -fdicts-strict -flate-dmd-anal  -fno-state-hack
+  sparse-linear: -O2 -fsimpl-tick-factor=10000 -fdicts-cheap -fdicts-strict -flate-dmd-anal  -fno-state-hack
+  gargantext-graph: -O2 -fsimpl-tick-factor=10000 -fdicts-cheap -fdicts-strict -flate-dmd-anal  -fno-state-hack