Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
haskell-gargantext
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
195
Issues
195
List
Board
Labels
Milestones
Merge Requests
12
Merge Requests
12
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gargantext
haskell-gargantext
Commits
43fe729b
Commit
43fe729b
authored
Jul 01, 2020
by
Alexandre Delanoë
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[FIX+DOC] haddock + warnings
parent
d5c72ed2
Pipeline
#920
failed with stage
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
Types.hs
src/Gargantext/API/Admin/Orchestrator/Types.hs
+1
-1
Matrice.hs
src/Gargantext/Viz/Graph/Distances/Matrice.hs
+6
-5
No files found.
src/Gargantext/API/Admin/Orchestrator/Types.hs
View file @
43fe729b
...
@@ -32,8 +32,8 @@ data ExternalAPIs = All
...
@@ -32,8 +32,8 @@ data ExternalAPIs = All
|
HAL
|
HAL
|
IsTex
|
IsTex
|
Isidore
|
Isidore
-- | IsidoreAuth
deriving
(
Show
,
Eq
,
Enum
,
Bounded
,
Generic
)
deriving
(
Show
,
Eq
,
Enum
,
Bounded
,
Generic
)
-- | IsidoreAuth
-- | Main Instances
-- | Main Instances
...
...
src/Gargantext/Viz/Graph/Distances/Matrice.hs
View file @
43fe729b
...
@@ -245,15 +245,16 @@ distributional m = run -- $ matMiniMax
...
@@ -245,15 +245,16 @@ distributional m = run -- $ matMiniMax
where
where
-- filter m = zipWith (\a b -> max a b) m (transpose m)
-- filter m = zipWith (\a b -> max a b) m (transpose m)
{-
ri :: Acc (Matrix Double) -> Acc (Matrix Double)
ri :: Acc (Matrix Double) -> Acc (Matrix Double)
ri mat = mat1 -- zipWith (/) mat1 mat2
ri mat = mat1 -- zipWith (/) mat1 mat2
where
where
mat1 = matSumCol n $ zipWith min' (myMin mat) (myMin $ transpose mat)
mat1 = matSumCol n $ zipWith min' (myMin mat) (myMin $ transpose mat)
mat2 = total mat
mat2 = total mat
myMin :: Acc (Matrix Double) -> Acc (Matrix Double)
myMin :: Acc (Matrix Double) -> Acc (Matrix Double)
myMin = replicate (constant (Z :. n :. All)) . minimum
myMin = replicate (constant (Z :. n :. All)) . minimum
-}
-- TODO fix NaN
-- TODO fix NaN
-- Quali TEST: OK
-- Quali TEST: OK
...
@@ -279,7 +280,7 @@ identityMatrix n =
...
@@ -279,7 +280,7 @@ identityMatrix n =
eyeMatrix
::
Num
a
=>
Dim
->
Acc
(
Matrix
a
)
->
Acc
(
Matrix
a
)
eyeMatrix
::
Num
a
=>
Dim
->
Acc
(
Matrix
a
)
->
Acc
(
Matrix
a
)
eyeMatrix
n'
m
=
eyeMatrix
n'
_
m
=
let
ones
=
fill
(
index2
n
n
)
1
let
ones
=
fill
(
index2
n
n
)
1
zeros
=
fill
(
index1
n
)
0
zeros
=
fill
(
index1
n
)
0
n
=
constant
n'
n
=
constant
n'
...
@@ -288,18 +289,18 @@ eyeMatrix n' m =
...
@@ -288,18 +289,18 @@ eyeMatrix n' m =
selfMatrix
::
Num
a
=>
Dim
->
Acc
(
Matrix
a
)
->
Acc
(
Matrix
a
)
selfMatrix
::
Num
a
=>
Dim
->
Acc
(
Matrix
a
)
->
Acc
(
Matrix
a
)
selfMatrix
n'
m
=
selfMatrix
n'
_
m
=
let
zeros
=
fill
(
index2
n
n
)
0
let
zeros
=
fill
(
index2
n
n
)
0
ones
=
fill
(
index2
n
n
)
1
ones
=
fill
(
index2
n
n
)
1
n
=
constant
n'
n
=
constant
n'
in
in
permute
const
ones
(
lift1
(
\
(
Z
:.
(
i
::
Exp
Int
)
:.
(
j
::
Exp
Int
))
permute
const
ones
(
lift1
(
\
(
Z
:.
(
i
::
Exp
Int
)
:.
(
_
j
::
Exp
Int
))
->
-- ifThenElse (i /= j)
->
-- ifThenElse (i /= j)
-- (Z :. i :. j)
-- (Z :. i :. j)
(
Z
:.
i
:.
i
)
(
Z
:.
i
:.
i
)
))
zeros
))
zeros
selfMatrix'
::
(
Elt
a
,
P
.
Num
(
Exp
a
))
=>
Array
DIM2
a
->
Matrix
a
selfMatrix'
m'
=
run
$
selfMatrix
n
m
selfMatrix'
m'
=
run
$
selfMatrix
n
m
where
where
n
=
dim
m'
n
=
dim
m'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment