zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-21 16:05:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Loopy: revamp loop detection, but not using findloop.

Browse Source 
Loopy differs from the other recently-reworked puzzles in that it
doesn't disallow loops completely in the solution - indeed, one is
actually required! But not all loops are what you wanted, so you have
to be a bit more subtle in what you highlight as an error. And the new
findloop system doesn't make that easy, because it only answers the
question 'is this edge part of a loop?' and doesn't talk about loops
as a whole, or enumerate them.

But since I was working in this area anyway, I thought I might as well
have a think about it; and I've come up with a strategy that seems
quite sensible to me, which I describe in a big comment added in
loopy.c. In particular, the new strategy should make a more sensible
decision about whether to highlight the loop or the non-loop edges, in
cases where the user has managed to enter a loop plus some extra
stuff.
This commit is contained in:
Simon Tatham
2016-02-24 19:22:57 +00:00
parent 755c3d5277
commit 24848706ed
1 changed files with 180 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

302
loopy.c
View File

@ -1489,141 +1489,115 @@ static game_state *new_game(midend *me, const game_params *params,
static int check_completion(game_state *state) static int check_completion(game_state *state)
{ {
grid *g = state->game_grid; grid *g = state->game_grid;
int *dsf; int i, ret;
int num_faces = g->num_faces; int *dsf, *component_state;
int i; int nsilly, nloop, npath, largest_comp, largest_size;
int infinite_area, finite_area; enum { COMP_NONE, COMP_LOOP, COMP_PATH, COMP_SILLY, COMP_EMPTY };
int loops_found = 0;
int found_edge_not_in_loop = FALSE;
memset(state->line_errors, 0, g->num_edges); memset(state->line_errors, 0, g->num_edges);
/* LL implementation of SGT's idea: /*
* A loop will partition the grid into an inside and an outside. * Find loops in the grid, and determine whether the puzzle is
* If there is more than one loop, the grid will be partitioned into * solved.
* even more distinct regions. We can therefore track equivalence of
* faces, by saying that two faces are equivalent when there is a non-YES
* edge between them.
* We could keep track of the number of connected components, by counting
* the number of dsf-merges that aren't no-ops.
* But we're only interested in 3 separate cases:
* no loops, one loop, more than one loop.
* *
* No loops: all faces are equivalent to the infinite face. * Loopy is a bit more complicated than most puzzles that care
* One loop: only two equivalence classes - finite and infinite. * about loop detection. In most of them, loops are simply
* >= 2 loops: there are 2 distinct finite regions. * _forbidden_; so the obviously right way to do
* error-highlighting during play is to light up a graph edge red
* iff it is part of a loop, which is exactly what the centralised
* findloop.c makes easy.
* *
* So we simply make two passes through all the edges. * But Loopy is unusual in that you're _supposed_ to be making a
* In the first pass, we dsf-merge the two faces bordering each non-YES * loop - and yet _some_ loops are not the right loop. So we need
* edge. * to be more discriminating, by identifying loops one by one and
* In the second pass, we look for YES-edges bordering: * then thinking about which ones to highlight, and so findloop.c
* a) two non-equivalent faces. * isn't quite the right tool for the job in this case.
* b) two non-equivalent faces, and one of them is part of a different
* finite area from the first finite area we've seen.
* *
* An occurrence of a) means there is at least one loop. * Worse still, consider situations in which the grid contains a
* An occurrence of b) means there is more than one loop. * loop and also some non-loop edges: there are some cases like
* Edges satisfying a) are marked as errors. * this in which the user's intuitive expectation would be to
* highlight the loop (if you're only about half way through the
* puzzle and have accidentally made a little loop in some corner
* of the grid), and others in which they'd be more likely to
* expect you to highlight the non-loop edges (if you've just
* closed off a whole loop that you thought was the entire
* solution, but forgot some disconnected edges in a corner
* somewhere). So while it's easy enough to check whether the
* solution is _right_, highlighting the wrong parts is a tricky
* problem for this puzzle!
* *
* While we're at it, we set a flag if we find a YES edge that is not * I'd quite like, in some situations, to identify the largest
* part of a loop. * loop among the player's YES edges, and then light up everything
* This information will help decide, if there's a single loop, whether it * other than that. But finding the longest cycle in a graph is an
* is a candidate for being a solution (that is, all YES edges are part of * NP-complete problem (because, in particular, it must return a
* this loop). * Hamilton cycle if one exists).
* *
* If there is a candidate loop, we then go through all clues and check * However, I think we can make the problem tractable by
* they are all satisfied. If so, we have found a solution and we can * exercising the Puzzles principle that it isn't absolutely
* unmark all line_errors. * necessary to highlight _all_ errors: the key point is that by
* the time the user has filled in the whole grid, they should
* either have seen a completion flash, or have _some_ error
* highlight showing them why the solution isn't right. So in
* principle it would be *just about* good enough to highlight
* just one error in the whole grid, if there was really no better
* way. But we'd like to highlight as many errors as possible.
*
* In this case, I think the simple approach is to make use of the
* fact that no vertex may have degree > 2, and that's really
* simple to detect. So the plan goes like this:
*
* - Form the dsf of connected components of the graph vertices.
*
* - Highlight an error at any vertex with degree > 2. (It so
* happens that we do this by lighting up all the edges
* incident to that vertex, but that's an output detail.)
*
* - Any component that contains such a vertex is now excluded
* from further consideration, because it already has a
* highlight.
*
* - The remaining components have no vertex with degree > 2, and
* hence they all consist of either a simple loop, or a simple
* path with two endpoints.
*
* - If the sensible components are all paths, or if there's
* exactly one of them and it is a loop, then highlight no
* further edge errors. (The former case is normal during play,
* and the latter is a potentially solved puzzle.)
*
* - Otherwise - if there is more than one sensible component
* _and_ at least one of them is a loop - find the largest of
* the sensible components, leave that one unhighlighted, and
* light the rest up in red.
*/ */
/* Infinite face is at the end - its index is num_faces. dsf = snew_dsf(g->num_dots);
* This macro is just to make this obvious! */
#define INF_FACE num_faces /* Build the dsf. */
dsf = snewn(num_faces + 1, int);
dsf_init(dsf, num_faces + 1);
/* First pass */
for (i = 0; i < g->num_edges; i++) { for (i = 0; i < g->num_edges; i++) {
grid_edge *e = g->edges + i; if (state->lines[i] == LINE_YES) {
int f1 = e->face1 ? e->face1 - g->faces : INF_FACE; grid_edge *e = g->edges + i;
int f2 = e->face2 ? e->face2 - g->faces : INF_FACE; int d1 = e->dot1 - g->dots, d2 = e->dot2 - g->dots;
if (state->lines[i] != LINE_YES) dsf_merge(dsf, d1, d2);
dsf_merge(dsf, f1, f2);
}
/* Second pass */
infinite_area = dsf_canonify(dsf, INF_FACE);
finite_area = -1;
for (i = 0; i < g->num_edges; i++) {
grid_edge *e = g->edges + i;
int f1 = e->face1 ? e->face1 - g->faces : INF_FACE;
int can1 = dsf_canonify(dsf, f1);
int f2 = e->face2 ? e->face2 - g->faces : INF_FACE;
int can2 = dsf_canonify(dsf, f2);
if (state->lines[i] != LINE_YES) continue;
if (can1 == can2) {
/* Faces are equivalent, so this edge not part of a loop */
found_edge_not_in_loop = TRUE;
continue;
}
state->line_errors[i] = TRUE;
if (loops_found == 0) loops_found = 1;
/* Don't bother with further checks if we've already found 2 loops */
if (loops_found == 2) continue;
if (finite_area == -1) {
/* Found our first finite area */
if (can1 != infinite_area)
finite_area = can1;
else
finite_area = can2;
}
/* Have we found a second area? */
if (finite_area != -1) {
if (can1 != infinite_area && can1 != finite_area) {
loops_found = 2;
continue;
}
if (can2 != infinite_area && can2 != finite_area) {
loops_found = 2;
}
} }
} }
/* /* Initialise a state variable for each connected component. */
printf("loops_found = %d\n", loops_found); component_state = snewn(g->num_dots, int);
printf("found_edge_not_in_loop = %s\n",
found_edge_not_in_loop ? "TRUE" : "FALSE");
*/
sfree(dsf); /* No longer need the dsf */
/* Have we found a candidate loop? */
if (loops_found == 1 && !found_edge_not_in_loop) {
/* Yes, so check all clues are satisfied */
int found_clue_violation = FALSE;
for (i = 0; i < num_faces; i++) {
int c = state->clues[i];
if (c >= 0) {
if (face_order(state, i, LINE_YES) != c) {
found_clue_violation = TRUE;
break;
}
}
}
if (!found_clue_violation) {
/* The loop is good */
memset(state->line_errors, 0, g->num_edges);
return TRUE; /* No need to bother checking for dot violations */
}
}
/* Check for dot violations */
for (i = 0; i < g->num_dots; i++) { for (i = 0; i < g->num_dots; i++) {
if (dsf_canonify(dsf, i) == i)
component_state[i] = COMP_LOOP;
else
component_state[i] = COMP_NONE;
}
/* Check for dots with degree > 3. Here we also spot dots of
* degree 1 in which the user has marked all the non-edges as
* LINE_NO, because those are also clear vertex-level errors, so
* we give them the same treatment of excluding their connected
* component from the subsequent loop analysis. */
for (i = 0; i < g->num_dots; i++) {
int comp = dsf_canonify(dsf, i);
int yes = dot_order(state, i, LINE_YES); int yes = dot_order(state, i, LINE_YES);
int unknown = dot_order(state, i, LINE_UNKNOWN); int unknown = dot_order(state, i, LINE_UNKNOWN);
if ((yes == 1 && unknown == 0) || (yes >= 3)) { if ((yes == 1 && unknown == 0) || (yes >= 3)) {
@ -1635,9 +1609,93 @@ static int check_completion(game_state *state)
if (state->lines[e] == LINE_YES) if (state->lines[e] == LINE_YES)
state->line_errors[e] = TRUE; state->line_errors[e] = TRUE;
} }
/* And mark this component as not worthy of further
* consideration. */
component_state[comp] = COMP_SILLY;
} else if (yes == 0) {
/* A completely isolated dot must also be excluded it from
* the subsequent loop highlighting pass, but we tag it
* with a different enum value to avoid it counting
* towards the components that inhibit returning a win
* status. */
component_state[comp] = COMP_EMPTY;
} else if (yes == 1) {
/* A dot with degree 1 that didn't fall into the 'clearly
* erroneous' case above indicates that this connected
* component will be a path rather than a loop - unless
* something worse elsewhere in the component has
* classified it as silly. */
if (component_state[comp] != COMP_SILLY)
component_state[comp] = COMP_PATH;
} }
} }
return FALSE;
/* Count up the components. Also, find the largest sensible
* component. (Tie-breaking condition is derived from the order of
* vertices in the grid data structure, which is fairly arbitrary
* but at least stays stable throughout the game.) */
nsilly = nloop = npath = 0;
largest_comp = largest_size = -1;
for (i = 0; i < g->num_dots; i++) {
if (component_state[i] == COMP_SILLY) {
nsilly++;
} else if (component_state[i] == COMP_PATH ||
component_state[i] == COMP_LOOP) {
int this_size;
if (component_state[i] == COMP_PATH)
npath++;
else if (component_state[i] == COMP_LOOP)
nloop++;
if ((this_size = dsf_size(dsf, i)) > largest_size) {
largest_comp = i;
largest_size = this_size;
}
}
}
if (nloop > 0 && nloop + npath > 1) {
/*
* If there are at least two sensible components including at
* least one loop, highlight all edges in every sensible
* component that is not the largest one.
*/
for (i = 0; i < g->num_edges; i++) {
if (state->lines[i] == LINE_YES) {
grid_edge *e = g->edges + i;
int d1 = e->dot1 - g->dots; /* either endpoint is good enough */
int comp = dsf_canonify(dsf, d1);
if (component_state[comp] != COMP_SILLY &&
comp != largest_comp)
state->line_errors[i] = TRUE;
}
}
}
if (nloop == 1 && npath == 0 && nsilly == 0) {
/*
* If there is exactly one component and it is a loop, then
* the puzzle is potentially complete, so check the clues.
*/
ret = TRUE;
for (i = 0; i < g->num_faces; i++) {
int c = state->clues[i];
if (c >= 0 && face_order(state, i, LINE_YES) != c) {
ret = FALSE;
break;
}
}
} else {
ret = FALSE;
}
sfree(component_state);
sfree(dsf);
return ret;
} }
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------