Commit 4e9ab73a authored by Alexandre Delanoë's avatar Alexandre Delanoë

[FIX] Label issue (for tests)

parent f91cf59b
...@@ -5,7 +5,7 @@ cabal-version: 1.12 ...@@ -5,7 +5,7 @@ cabal-version: 1.12
-- see: https://github.com/sol/hpack -- see: https://github.com/sol/hpack
name: gargantext name: gargantext
version: 0.0.5.8.9.8 version: 0.0.5.8.9.8
synopsis: Search, map, share synopsis: Search, map, share
description: Please see README.md description: Please see README.md
category: Data category: Data
......
...@@ -31,7 +31,7 @@ module Gargantext.Core.Methods.Matrix.Accelerate.Utils ...@@ -31,7 +31,7 @@ module Gargantext.Core.Methods.Matrix.Accelerate.Utils
where where
import qualified Data.Foldable as P (foldl1) import qualified Data.Foldable as P (foldl1)
import Debug.Trace (trace) -- import Debug.Trace (trace)
import Data.Array.Accelerate import Data.Array.Accelerate
import Data.Array.Accelerate.Interpreter (run) import Data.Array.Accelerate.Interpreter (run)
import qualified Gargantext.Prelude as P import qualified Gargantext.Prelude as P
...@@ -306,7 +306,7 @@ sumRowMin n m = {-trace (P.show $ run m') $-} m' ...@@ -306,7 +306,7 @@ sumRowMin n m = {-trace (P.show $ run m') $-} m'
$ P.map (\z -> sumRowMin1 n (constant z) m) [0..n-1] $ P.map (\z -> sumRowMin1 n (constant z) m) [0..n-1]
sumRowMin1 :: (Num a, Ord a) => Dim -> Exp Int -> Acc (Matrix a) -> Acc (Vector a) sumRowMin1 :: (Num a, Ord a) => Dim -> Exp Int -> Acc (Matrix a) -> Acc (Vector a)
sumRowMin1 n x m = trace (P.show (run m,run $ transpose m)) $ m'' sumRowMin1 n x m = {-trace (P.show (run m,run $ transpose m)) $-} m''
where where
m'' = sum $ zipWith min (transpose m) m m'' = sum $ zipWith min (transpose m) m
_m' = zipWith (*) (zipWith (*) (nullOf n (MatCol x)) $ nullOfWithDiag n (MatRow x)) m _m' = zipWith (*) (zipWith (*) (nullOf n (MatCol x)) $ nullOfWithDiag n (MatRow x)) m
......
...@@ -182,14 +182,13 @@ computeGraph cId method d nt repo = do ...@@ -182,14 +182,13 @@ computeGraph cId method d nt repo = do
<$> groupNodesByNgrams ngs <$> groupNodesByNgrams ngs
<$> getContextsByNgramsOnlyUser cId (lIds <> [lId]) nt (HashMap.keys ngs) <$> getContextsByNgramsOnlyUser cId (lIds <> [lId]) nt (HashMap.keys ngs)
listNgrams <- getListNgrams [lId] nt
graph <- liftBase $ cooc2graphWith method d 0 myCooc graph <- liftBase $ cooc2graphWith method d 0 myCooc
let graph' = mergeGraphNgrams graph (Just listNgrams) -- listNgrams <- getListNgrams [lId] nt
--let graph' = mergeGraphNgrams graph (Just listNgrams)
-- saveAsFileDebug "/tmp/graphWithNodes" graph' -- saveAsFileDebug "/tmp/graphWithNodes" graph'
pure graph' pure graph
defaultGraphMetadata :: HasNodeError err defaultGraphMetadata :: HasNodeError err
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment