xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small code cleanup in diff implementation

Browse Source
This commit is contained in:
Maxime Coste 2017-07-15 17:17:27 +09:00
parent 6e40e57ed4
commit 5eae7aacc7
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/diff.hh
View File

@ -39,20 +39,14 @@ Snake find_end_snake_of_further_reaching_dpath(Iterator a, int N, Iterator b, in
const MirroredArray<int>& V, const MirroredArray<int>& V,
const int D, const int k, Equal eq) const int D, const int k, Equal eq)
{ {
int x; // our position along a
const bool add = k == -D or (k != D and V[k-1] < V[k+1]); const bool add = k == -D or (k != D and V[k-1] < V[k+1]);
// if diagonal on the right goes further along x than diagonal on the left, // if diagonal on the right goes further along x than diagonal on the left,
// then we take a vertical edge from it to this diagonal, hence x = V[k+1] // then we take a vertical edge from it to this diagonal, hence x = V[k+1]
if (add)
x = V[k+1];
// else, we take an horizontal edge from our left diagonal,x = V[k-1]+1 // else, we take an horizontal edge from our left diagonal,x = V[k-1]+1
else const int x = add ? V[k+1] : V[k-1]+1;
x = V[k-1]+1; // we are by construction on diagonal k, so our position along b (y) is x - k.
const int y = x - k;
int y = x - k; // we are by construction on diagonal k, so our position along
// b (y) is x - k.
int u = x, v = y; int u = x, v = y;
// follow end snake along diagonal k // follow end snake along diagonal k