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

Patch from James H to fix a bug in which ambiguous puzzles would

Browse Source 
occasionally be generated, e.g. by 8x8de#417341658689473 .

[originally from svn r8845]
This commit is contained in:
Simon Tatham
2010-01-17 01:05:55 +00:00
parent 6d5493300f
commit 6b650f894c
1 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
singles.c
View File

@ -450,7 +450,10 @@ static void connect_dsf(game_state *state, int *dsf)
} }
} }
static int check_rowcol(game_state *state, int starti, int di, int sz, int mark_errors) #define CC_MARK_ERRORS 1
#define CC_MUST_FILL 2
static int check_rowcol(game_state *state, int starti, int di, int sz, unsigned flags)
{ {
int nerr = 0, n, m, i, j; int nerr = 0, n, m, i, j;
@ -466,7 +469,7 @@ static int check_rowcol(game_state *state, int starti, int di, int sz, int mark_
if (state->nums[i] != state->nums[j]) continue; if (state->nums[i] != state->nums[j]) continue;
nerr++; /* ok, we have two numbers the same in a row. */ nerr++; /* ok, we have two numbers the same in a row. */
if (!mark_errors) continue; if (!(flags & CC_MARK_ERRORS)) continue;
/* If we have two circles in the same row around /* If we have two circles in the same row around
* two identical numbers, they are _both_ wrong. */ * two identical numbers, they are _both_ wrong. */
@ -491,17 +494,27 @@ static int check_rowcol(game_state *state, int starti, int di, int sz, int mark_
return nerr; return nerr;
} }
static int check_complete(game_state *state, int mark_errors) static int check_complete(game_state *state, unsigned flags)
{ {
int *dsf = snewn(state->n, int); int *dsf = snewn(state->n, int);
int x, y, i, error = 0, nwhite, w = state->w, h = state->h; int x, y, i, error = 0, nwhite, w = state->w, h = state->h;
if (mark_errors) { if (flags & CC_MARK_ERRORS) {
for (i = 0; i < state->n; i++) for (i = 0; i < state->n; i++)
state->flags[i] &= ~F_ERROR; state->flags[i] &= ~F_ERROR;
} }
connect_dsf(state, dsf); connect_dsf(state, dsf);
/* If we're the solver we need the grid all to be definitively
* black or definitively white (i.e. circled) otherwise the solver
* has found an ambiguous grid. */
if (flags & CC_MUST_FILL) {
for (i = 0; i < state->n; i++) {
if (!(state->flags[i] & F_BLACK) && !(state->flags[i] & F_CIRCLE))
error += 1;
}
}
/* Mark any black squares in groups of >1 as errors. /* Mark any black squares in groups of >1 as errors.
* Count number of white squares. */ * Count number of white squares. */
nwhite = 0; nwhite = 0;
@ -509,7 +522,7 @@ static int check_complete(game_state *state, int mark_errors)
if (state->flags[i] & F_BLACK) { if (state->flags[i] & F_BLACK) {
if (dsf_size(dsf, i) > 1) { if (dsf_size(dsf, i) > 1) {
error += 1; error += 1;
if (mark_errors) if (flags & CC_MARK_ERRORS)
state->flags[i] |= F_ERROR; state->flags[i] |= F_ERROR;
} }
} else } else
@ -518,9 +531,9 @@ static int check_complete(game_state *state, int mark_errors)
/* Check attributes of white squares, row- and column-wise. */ /* Check attributes of white squares, row- and column-wise. */
for (x = 0; x < w; x++) /* check cols from (x,0) */ for (x = 0; x < w; x++) /* check cols from (x,0) */
error += check_rowcol(state, x, w, h, mark_errors); error += check_rowcol(state, x, w, h, flags);
for (y = 0; y < h; y++) /* check rows from (0,y) */ for (y = 0; y < h; y++) /* check rows from (0,y) */
error += check_rowcol(state, y*w, 1, w, mark_errors); error += check_rowcol(state, y*w, 1, w, flags);
/* mark (all) white regions as an error if there is more than one. /* mark (all) white regions as an error if there is more than one.
* may want to make this less in-your-face (by only marking * may want to make this less in-your-face (by only marking
@ -530,7 +543,7 @@ static int check_complete(game_state *state, int mark_errors)
if (!(state->flags[i] & F_BLACK) && if (!(state->flags[i] & F_BLACK) &&
dsf_size(dsf, i) < nwhite) { dsf_size(dsf, i) < nwhite) {
error += 1; error += 1;
if (mark_errors) if (flags & CC_MARK_ERRORS)
state->flags[i] |= F_ERROR; state->flags[i] |= F_ERROR;
} }
} }
@ -1155,7 +1168,7 @@ static int solve_specific(game_state *state, int diff, int sneaky)
} }
solver_state_free(ss); solver_state_free(ss);
return state->impossible ? -1 : check_complete(state, 0); return state->impossible ? -1 : check_complete(state, CC_MUST_FILL);
} }
static char *solve_game(game_state *state, game_state *currstate, static char *solve_game(game_state *state, game_state *currstate,
@ -1542,7 +1555,7 @@ static game_state *execute_move(game_state *state, char *move)
else if (*move) else if (*move)
goto badmove; goto badmove;
} }
if (check_complete(ret, 1)) ret->completed = 1; if (check_complete(ret, CC_MARK_ERRORS)) ret->completed = 1;
return ret; return ret;
badmove: badmove: