zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-20 23:51:29 -07:00
Code Issues Packages Projects Releases Wiki Activity

Introduce a new dsf_equivalent() function.

Browse Source 
Not very interesting, but the idiom for checking equivalence via two
calls to dsf_canonify is cumbersome enough to be worth abbreviating.
This commit is contained in:
Simon Tatham
2023-04-20 15:32:10 +01:00
parent 088fdeee38
commit 14e1e05510
7 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bridges.c
View File

@ -1167,7 +1167,7 @@ static void map_group(game_state *state)
if (!is_join) continue;
d2 = DINDEX(is_join->x, is_join->y);
if (dsf_canonify(dsf,d1) == dsf_canonify(dsf,d2)) {
if (dsf_equivalent(dsf, d1, d2)) {
; /* we have a loop. See comment in map_hasloops. */
/* However, we still want to merge all squares joining
* this side-that-makes-a-loop. */
@ -1291,7 +1291,7 @@ static void solve_join(struct island *is, int direction, int n, bool is_max)
if (n > 0 && !is_max) {
d1 = DINDEX(is->x, is->y);
d2 = DINDEX(is_orth->x, is_orth->y);
if (dsf_canonify(dsf, d1) != dsf_canonify(dsf, d2))
if (!dsf_equivalent(dsf, d1, d2))
dsf_merge(dsf, d1, d2);
}
}
@ -1410,7 +1410,7 @@ static bool solve_island_checkloop(struct island *is, int direction)
d1 = DINDEX(is->x, is->y);
d2 = DINDEX(is_orth->x, is_orth->y);
if (dsf_canonify(dsf, d1) == dsf_canonify(dsf, d2)) {
if (dsf_equivalent(dsf, d1, d2)) {
/* two islands are connected already; don't join them. */
return true;
}