Commit 90f7241e authored by Alexandre Delanoë's avatar Alexandre Delanoë

[Bridgeness] fix.

parent 8e00be36
Pipeline #143 failed with stage
...@@ -35,7 +35,7 @@ ordEdgesBetween :: (Ord distance, Ord node) ...@@ -35,7 +35,7 @@ ordEdgesBetween :: (Ord distance, Ord node)
=> [node] -> [node] => [node] -> [node]
-> Map (node, node) distance -> Map (node, node) distance
-> [((node, node), distance)] -> [((node, node), distance)]
ordEdgesBetween c1 c2 d = reverse $ sortOn snd $ catMaybes ordEdgesBetween c1 c2 d = sortOn snd $ catMaybes
[ (,) <$> Just (n1,n2) [ (,) <$> Just (n1,n2)
<*> lookup (n1,n2) d <*> lookup (n1,n2) d
| n1 <- c1 | n1 <- c1
...@@ -49,11 +49,10 @@ filterEdgesBetween :: (RealFrac b, Ord node, Ord distance) => ...@@ -49,11 +49,10 @@ filterEdgesBetween :: (RealFrac b, Ord node, Ord distance) =>
-> [((node, node), distance)] -> [((node, node), distance)]
filterEdgesBetween b c1 c2 d = take n d' filterEdgesBetween b c1 c2 d = take n d'
where where
n = round $ b * i / (s1 + s2) n = round $ b * i / (len c1 + len c2)
d' = ordEdgesBetween c1 c2 d d' = ordEdgesBetween c1 c2 d
i = fromIntegral $ length d' i = fromIntegral $ length d'
s1 = fromIntegral $ length (ordEdgesBetween c1 c2 d) len c = fromIntegral $ length (ordEdgesBetween c c d)
s2 = fromIntegral $ length (ordEdgesBetween c2 c2 d)
bridgeness :: Bridgeness bridgeness :: Bridgeness
......
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