X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/b5ba72bc4698800049947cdf7696cb44f11096bb..1a960a48298c0eb3832704bbd5bb72023d2873a0:/singles.c diff --git a/singles.c b/singles.c index ec5db73..ff75cfb 100644 --- a/singles.c +++ b/singles.c @@ -324,7 +324,7 @@ static char n2c(int num) { } static int c2n(char c) { - if (isdigit(c)) + if (isdigit((unsigned char)c)) return (int)(c - '0'); else if (c >= 'a' && c <= 'z') return (int)(c - 'a' + 10); @@ -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; @@ -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; 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 * 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; } -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 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++) state->flags[i] &= ~F_ERROR; } 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. * Count number of white squares. */ nwhite = 0; @@ -509,7 +522,7 @@ static int check_complete(game_state *state, int mark_errors) if (state->flags[i] & F_BLACK) { if (dsf_size(dsf, i) > 1) { error += 1; - if (mark_errors) + if (flags & CC_MARK_ERRORS) state->flags[i] |= F_ERROR; } } else @@ -518,9 +531,9 @@ static int check_complete(game_state *state, int mark_errors) /* Check attributes of white squares, row- and column-wise. */ 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) */ - 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. * 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) && dsf_size(dsf, i) < nwhite) { error += 1; - if (mark_errors) + if (flags & CC_MARK_ERRORS) state->flags[i] |= F_ERROR; } } @@ -1155,7 +1168,7 @@ static int solve_specific(game_state *state, int diff, int sneaky) } 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, @@ -1164,11 +1177,11 @@ static char *solve_game(game_state *state, game_state *currstate, game_state *solved = dup_game(currstate); char *move = NULL; - if (solve_specific(solved, DIFF_ANY, 0)) goto solved; + if (solve_specific(solved, DIFF_ANY, 0) > 0) goto solved; free_game(solved); solved = dup_game(state); - if (solve_specific(solved, DIFF_ANY, 0)) goto solved; + if (solve_specific(solved, DIFF_ANY, 0) > 0) goto solved; free_game(solved); *error = "Unable to solve puzzle."; @@ -1256,7 +1269,7 @@ static int best_black_col(game_state *state, random_state *rs, int *scratch, for (i = 0; i < o; i++) { j = scratch[i] + 1; if (rownums[y*o + j-1] == 1 && colnums[x*o + j-1] == 1) - return j; + goto found; } /* Then try each number in turn returning the first one that's @@ -1264,10 +1277,16 @@ static int best_black_col(game_state *state, random_state *rs, int *scratch, for (i = 0; i < o; i++) { j = scratch[i] + 1; if (rownums[y*o + j-1] != 0 || colnums[x*o + j-1] != 0) - return j; + goto found; } assert(!"unable to place number under black cell."); return 0; + +found: + /* Update column and row counts assuming this number will be placed. */ + rownums[y*o + j-1] += 1; + colnums[x*o + j-1] += 1; + return j; } static char *new_game_desc(game_params *params, random_state *rs, @@ -1536,7 +1555,7 @@ static game_state *execute_move(game_state *state, char *move) else if (*move) goto badmove; } - if (check_complete(ret, 1)) ret->completed = 1; + if (check_complete(ret, CC_MARK_ERRORS)) ret->completed = 1; return ret; badmove: @@ -1716,6 +1735,11 @@ static float game_flash_length(game_state *oldstate, game_state *newstate, return 0.0F; } +static int game_status(game_state *state) +{ + return state->completed ? +1 : 0; +} + static int game_timing_state(game_state *state, game_ui *ui) { return TRUE; @@ -1802,6 +1826,7 @@ const struct game thegame = { game_redraw, game_anim_length, game_flash_length, + game_status, TRUE, FALSE, game_print_size, game_print, FALSE, /* wants_statusbar */ FALSE, game_timing_state, @@ -1935,13 +1960,13 @@ int main(int argc, char **argv) if (verbose) { tgame = game_text_format(s); - printf(tgame); + fputs(tgame, stdout); sfree(tgame); } soln = solve_specific(s, DIFF_ANY, 0); tgame = game_text_format(s); - printf(tgame); + fputs(tgame, stdout); sfree(tgame); printf("Game was %s.\n\n", soln < 0 ? "impossible" : soln > 0 ? "solved" : "not solved");