github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-12-22 14:21:31 +03:00
Code Issues Projects Releases Wiki Activity

Extract a common constructor for the diagonal interval.

Browse Source
This commit is contained in:
Rob Rix 2017-03-13 15:16:43 -04:00
parent 7e02b60c3b
commit 08cf871da9
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/SES/Myers.hs
View File

@ -121,7 +121,7 @@ decompose myers = let ?callStack = popCallStack callStack in case myers of
forwardEndpoint <- findDPath graph (EditDistance d) Forward (Diagonal k) forwardEndpoint <- findDPath graph (EditDistance d) Forward (Diagonal k)
backwardV <- gets backward backwardV <- gets backward
let reverseEndpoint = let x = backwardV `at` k in Endpoint x (x - k) let reverseEndpoint = let x = backwardV `at` k in Endpoint x (x - k)
if odd delta && k `inInterval` (delta - pred d, delta + pred d) && overlaps graph forwardEndpoint reverseEndpoint then if odd delta && k `inInterval` diagonalInterval Forward d && overlaps graph forwardEndpoint reverseEndpoint then
return (done reverseEndpoint forwardEndpoint (2 * d - 1)) return (done reverseEndpoint forwardEndpoint (2 * d - 1))
else else
continue continue
@ -130,7 +130,7 @@ decompose myers = let ?callStack = popCallStack callStack in case myers of
reverseEndpoint <- findDPath graph (EditDistance d) Reverse (Diagonal (k + delta)) reverseEndpoint <- findDPath graph (EditDistance d) Reverse (Diagonal (k + delta))
forwardV <- gets forward forwardV <- gets forward
let forwardEndpoint = let x = forwardV `at` (k + delta) in Endpoint x (x - k) let forwardEndpoint = let x = forwardV `at` (k + delta) in Endpoint x (x - k)
if even delta && (k + delta) `inInterval` (negate d, d) && overlaps graph forwardEndpoint reverseEndpoint then if even delta && (k + delta) `inInterval` diagonalInterval Reverse d && overlaps graph forwardEndpoint reverseEndpoint then
return (done reverseEndpoint forwardEndpoint (2 * d)) return (done reverseEndpoint forwardEndpoint (2 * d))
else else
continue continue
@ -168,6 +168,9 @@ decompose myers = let ?callStack = popCallStack callStack in case myers of
at v k = v ! maxD + k at v k = v ! maxD + k
diagonalInterval Forward d = (delta - pred d, delta + pred d)
diagonalInterval Reverse d = (negate d, d)
done (Endpoint x y) uv d = Just (Snake (Endpoint (n - x) (m - y)) uv, EditDistance d) done (Endpoint x y) uv d = Just (Snake (Endpoint (n - x) (m - y)) uv, EditDistance d)
slide dir eq (Endpoint x y) slide dir eq (Endpoint x y)