diff --git a/bin/gargantext-adaptative-phylo/Main.hs b/bin/gargantext-adaptative-phylo/Main.hs index addf58d6ff5ad63216b32986e5fd2bdabda3ffd5..e4050120d7728550a7f3293b4f22a7dfd6b1b19b 100644 --- a/bin/gargantext-adaptative-phylo/Main.hs +++ b/bin/gargantext-adaptative-phylo/Main.hs @@ -166,11 +166,12 @@ main = do let clq = case (clique config) of Fis s s' -> "fis_" <> (show s) <> "_" <> (show s') - MaxClique s _ _ -> "clique_" <> (show s) + MaxClique s t f -> "clique_" <> (show s)<> "_" <> (show f)<> "_" <> (show t) let sensibility = case (phyloProximity config) of Hamming -> undefined WeightedLogJaccard s -> (show s) + WeightedLogSim s -> (show s) let sync = case (phyloSynchrony config) of ByProximityThreshold t _ _ _ -> (show t) diff --git a/src/Gargantext/Core/Viz/Phylo/TemporalMatching.hs b/src/Gargantext/Core/Viz/Phylo/TemporalMatching.hs index e32f1744ff3e98ca12d454322fb8860926813e73..3647590f11baba5d9e18e0ca292fb109b78f9683 100644 --- a/src/Gargantext/Core/Viz/Phylo/TemporalMatching.hs +++ b/src/Gargantext/Core/Viz/Phylo/TemporalMatching.hs @@ -43,12 +43,12 @@ jaccard inter' union' = ((fromIntegral . length) $ inter') / ((fromIntegral . le -- | Process the inverse sumLog sumInvLog' :: Double -> Double -> [Double] -> Double -sumInvLog' s nb diago = foldl (\mem occ -> mem + (1 / (log (occ + 1/s) / log (nb + 1/s)))) 0 diago +sumInvLog' s nb diago = foldl (\mem occ -> mem + (1 / (log (occ + 1/ tan (s * pi / 2)) / log (nb + 1/ tan (s * pi / 2))))) 0 diago -- | Process the sumLog sumLog' :: Double -> Double -> [Double] -> Double -sumLog' s nb diago = foldl (\mem occ -> mem + (log (occ + 1/s) / log (nb + 1/s))) 0 diago +sumLog' s nb diago = foldl (\mem occ -> mem + (log (occ + 1/ tan (s * pi / 2)) / log (nb + 1/ tan (s * pi / 2)))) 0 diago weightedLogJaccard' :: Double -> Double -> Map Int Double -> [Int] -> [Int] -> Double