X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/93b1da3d0f613d616b930419354558365847bc7d..92d5b70917aed3fd361480f01bb7baeafed59c13:/solo.c?ds=sidebyside diff --git a/solo.c b/solo.c index 563217a..134331e 100644 --- a/solo.c +++ b/solo.c @@ -96,8 +96,6 @@ int solver_show_working; #include "puzzles.h" -#define max(x,y) ((x)>(y)?(x):(y)) - /* * To save space, I store digits internally as unsigned char. This * imposes a hard limit of 255 on the order of the puzzle. Since @@ -125,6 +123,7 @@ enum { COL_CLUE, COL_USER, COL_HIGHLIGHT, + COL_ERROR, COL_PENCIL, NCOLOURS }; @@ -177,8 +176,10 @@ static int game_fetch_preset(int i, char **name, game_params **params) { "3x3 Intermediate", { 3, 3, SYMM_ROT2, DIFF_INTERSECT } }, { "3x3 Advanced", { 3, 3, SYMM_ROT2, DIFF_SET } }, { "3x3 Unreasonable", { 3, 3, SYMM_ROT2, DIFF_RECURSIVE } }, +#ifndef SLOW_SYSTEM { "3x4 Basic", { 3, 4, SYMM_ROT2, DIFF_SIMPLE } }, { "4x4 Basic", { 4, 4, SYMM_ROT2, DIFF_SIMPLE } }, +#endif }; if (i < 0 || i >= lenof(presets)) @@ -844,7 +845,12 @@ static int nsolve_intersect(struct nsolve_usage *usage, return ret; } +struct nsolve_scratch { + unsigned char *grid, *rowidx, *colidx, *set; +}; + static int nsolve_set(struct nsolve_usage *usage, + struct nsolve_scratch *scratch, int start, int step1, int step2 #ifdef STANDALONE_SOLVER , char *fmt, ... @@ -853,10 +859,10 @@ static int nsolve_set(struct nsolve_usage *usage, { int c = usage->c, r = usage->r, cr = c*r; int i, j, n, count; - unsigned char *grid = snewn(cr*cr, unsigned char); - unsigned char *rowidx = snewn(cr, unsigned char); - unsigned char *colidx = snewn(cr, unsigned char); - unsigned char *set = snewn(cr, unsigned char); + unsigned char *grid = scratch->grid; + unsigned char *rowidx = scratch->rowidx; + unsigned char *colidx = scratch->colidx; + unsigned char *set = scratch->set; /* * We are passed a cr-by-cr matrix of booleans. Our first job @@ -999,10 +1005,6 @@ static int nsolve_set(struct nsolve_usage *usage, } if (progress) { - sfree(set); - sfree(colidx); - sfree(rowidx); - sfree(grid); return TRUE; } } @@ -1021,17 +1023,33 @@ static int nsolve_set(struct nsolve_usage *usage, break; /* done */ } - sfree(set); - sfree(colidx); - sfree(rowidx); - sfree(grid); - return FALSE; } +static struct nsolve_scratch *nsolve_new_scratch(struct nsolve_usage *usage) +{ + struct nsolve_scratch *scratch = snew(struct nsolve_scratch); + int cr = usage->cr; + scratch->grid = snewn(cr*cr, unsigned char); + scratch->rowidx = snewn(cr, unsigned char); + scratch->colidx = snewn(cr, unsigned char); + scratch->set = snewn(cr, unsigned char); + return scratch; +} + +static void nsolve_free_scratch(struct nsolve_scratch *scratch) +{ + sfree(scratch->set); + sfree(scratch->colidx); + sfree(scratch->rowidx); + sfree(scratch->grid); + sfree(scratch); +} + static int nsolve(int c, int r, digit *grid) { struct nsolve_usage *usage; + struct nsolve_scratch *scratch; int cr = c*r; int x, y, n; int diff = DIFF_BLOCK; @@ -1055,6 +1073,8 @@ static int nsolve(int c, int r, digit *grid) memset(usage->col, FALSE, cr * cr); memset(usage->blk, FALSE, cr * cr); + scratch = nsolve_new_scratch(usage); + /* * Place all the clue numbers we are given. */ @@ -1204,7 +1224,7 @@ static int nsolve(int c, int r, digit *grid) */ for (x = 0; x < cr; x += r) for (y = 0; y < r; y++) - if (nsolve_set(usage, cubepos(x,y,1), r*cr, 1 + if (nsolve_set(usage, scratch, cubepos(x,y,1), r*cr, 1 #ifdef STANDALONE_SOLVER , "set elimination, block (%d,%d)", 1+x/r, 1+y #endif @@ -1217,7 +1237,7 @@ static int nsolve(int c, int r, digit *grid) * Row-wise set elimination. */ for (y = 0; y < cr; y++) - if (nsolve_set(usage, cubepos(0,y,1), cr*cr, 1 + if (nsolve_set(usage, scratch, cubepos(0,y,1), cr*cr, 1 #ifdef STANDALONE_SOLVER , "set elimination, row %d", 1+YUNTRANS(y) #endif @@ -1230,7 +1250,7 @@ static int nsolve(int c, int r, digit *grid) * Column-wise set elimination. */ for (x = 0; x < cr; x++) - if (nsolve_set(usage, cubepos(x,0,1), cr, 1 + if (nsolve_set(usage, scratch, cubepos(x,0,1), cr, 1 #ifdef STANDALONE_SOLVER , "set elimination, column %d", 1+x #endif @@ -1246,6 +1266,8 @@ static int nsolve(int c, int r, digit *grid) break; } + nsolve_free_scratch(scratch); + sfree(usage->cube); sfree(usage->row); sfree(usage->col); @@ -1448,6 +1470,16 @@ static char *new_game_desc(game_params *params, random_state *rs, ai->r = r; ai->grid = snewn(cr * cr, digit); memcpy(ai->grid, grid, cr * cr * sizeof(digit)); + /* + * We might already have written *aux the last time we + * went round this loop, in which case we should free + * the old aux_info before overwriting it with the new + * one. + */ + if (*aux) { + sfree((*aux)->grid); + sfree(*aux); + } *aux = ai; } @@ -1833,22 +1865,36 @@ static game_state *make_move(game_state *from, game_ui *ui, game_drawstate *ds, tx = (x + TILE_SIZE - BORDER) / TILE_SIZE - 1; ty = (y + TILE_SIZE - BORDER) / TILE_SIZE - 1; - if (tx >= 0 && tx < cr && ty >= 0 && ty < cr && - (button == LEFT_BUTTON || button == RIGHT_BUTTON)) { - /* - * Prevent pencil-mode highlighting of a filled square. - */ - if (button == RIGHT_BUTTON && from->grid[ty*cr+tx]) - return NULL; - - if (tx == ui->hx && ty == ui->hy) { - ui->hx = ui->hy = -1; - } else { - ui->hx = tx; - ui->hy = ty; - } - ui->hpencil = (button == RIGHT_BUTTON); - return from; /* UI activity occurred */ + if (tx >= 0 && tx < cr && ty >= 0 && ty < cr) { + if (button == LEFT_BUTTON) { + if (from->immutable[ty*cr+tx]) { + ui->hx = ui->hy = -1; + } else if (tx == ui->hx && ty == ui->hy && ui->hpencil == 0) { + ui->hx = ui->hy = -1; + } else { + ui->hx = tx; + ui->hy = ty; + ui->hpencil = 0; + } + return from; /* UI activity occurred */ + } + if (button == RIGHT_BUTTON) { + /* + * Pencil-mode highlighting for non filled squares. + */ + if (from->grid[ty*cr+tx] == 0) { + if (tx == ui->hx && ty == ui->hy && ui->hpencil) { + ui->hx = ui->hy = -1; + } else { + ui->hpencil = 1; + ui->hx = tx; + ui->hy = ty; + } + } else { + ui->hx = ui->hy = -1; + } + return from; /* UI activity occurred */ + } } if (ui->hx != -1 && ui->hy != -1 && @@ -1864,8 +1910,14 @@ static game_state *make_move(game_state *from, game_ui *ui, game_drawstate *ds, if (button == ' ') n = 0; + /* + * Can't overwrite this square. In principle this shouldn't + * happen anyway because we should never have even been + * able to highlight the square, but it never hurts to be + * careful. + */ if (from->immutable[ui->hy*cr+ui->hx]) - return NULL; /* can't overwrite this square */ + return NULL; /* * Can't make pencil marks in a filled square. In principle @@ -1910,6 +1962,8 @@ struct game_drawstate { digit *grid; unsigned char *pencil; unsigned char *hl; + /* This is scratch space used within a single call to game_redraw. */ + int *entered_items; }; #define XSIZE(cr) ((cr) * TILE_SIZE + 2*BORDER + 1) @@ -1945,6 +1999,10 @@ static float *game_colours(frontend *fe, game_state *state, int *ncolours) ret[COL_HIGHLIGHT * 3 + 1] = 0.85F * ret[COL_BACKGROUND * 3 + 1]; ret[COL_HIGHLIGHT * 3 + 2] = 0.85F * ret[COL_BACKGROUND * 3 + 2]; + ret[COL_ERROR * 3 + 0] = 1.0F; + ret[COL_ERROR * 3 + 1] = 0.0F; + ret[COL_ERROR * 3 + 2] = 0.0F; + ret[COL_PENCIL * 3 + 0] = 0.5F * ret[COL_BACKGROUND * 3 + 0]; ret[COL_PENCIL * 3 + 1] = 0.5F * ret[COL_BACKGROUND * 3 + 1]; ret[COL_PENCIL * 3 + 2] = ret[COL_BACKGROUND * 3 + 2]; @@ -1968,6 +2026,7 @@ static game_drawstate *game_new_drawstate(game_state *state) memset(ds->pencil, 0, cr*cr*cr); ds->hl = snewn(cr*cr, unsigned char); memset(ds->hl, 0, cr*cr); + ds->entered_items = snewn(cr*cr, int); return ds; } @@ -1977,6 +2036,7 @@ static void game_free_drawstate(game_drawstate *ds) sfree(ds->hl); sfree(ds->pencil); sfree(ds->grid); + sfree(ds->entered_items); sfree(ds); } @@ -2013,10 +2073,10 @@ static void draw_number(frontend *fe, game_drawstate *ds, game_state *state, clip(fe, cx, cy, cw, ch); /* background needs erasing */ - draw_rect(fe, cx, cy, cw, ch, hl == 1 ? COL_HIGHLIGHT : COL_BACKGROUND); + draw_rect(fe, cx, cy, cw, ch, (hl & 15) == 1 ? COL_HIGHLIGHT : COL_BACKGROUND); /* pencil-mode highlight */ - if (hl == 2) { + if ((hl & 15) == 2) { int coords[6]; coords[0] = cx; coords[1] = cy; @@ -2035,7 +2095,7 @@ static void draw_number(frontend *fe, game_drawstate *ds, game_state *state, str[0] += 'a' - ('9'+1); draw_text(fe, tx + TILE_SIZE/2, ty + TILE_SIZE/2, FONT_VARIABLE, TILE_SIZE/2, ALIGN_VCENTRE | ALIGN_HCENTRE, - state->immutable[y*cr+x] ? COL_CLUE : COL_USER, str); + state->immutable[y*cr+x] ? COL_CLUE : (hl & 16) ? COL_ERROR : COL_USER, str); } else { /* pencil marks required? */ int i, j; @@ -2096,17 +2156,46 @@ static void game_redraw(frontend *fe, game_drawstate *ds, game_state *oldstate, } /* + * This array is used to keep track of rows, columns and boxes + * which contain a number more than once. + */ + for (x = 0; x < cr * cr; x++) + ds->entered_items[x] = 0; + for (x = 0; x < cr; x++) + for (y = 0; y < cr; y++) { + digit d = state->grid[y*cr+x]; + if (d) { + int box = (x/r)+(y/c)*c; + ds->entered_items[x*cr+d-1] |= ((ds->entered_items[x*cr+d-1] & 1) << 1) | 1; + ds->entered_items[y*cr+d-1] |= ((ds->entered_items[y*cr+d-1] & 4) << 1) | 4; + ds->entered_items[box*cr+d-1] |= ((ds->entered_items[box*cr+d-1] & 16) << 1) | 16; + } + } + + /* * Draw any numbers which need redrawing. */ for (x = 0; x < cr; x++) { for (y = 0; y < cr; y++) { int highlight = 0; + digit d = state->grid[y*cr+x]; + if (flashtime > 0 && (flashtime <= FLASH_TIME/3 || flashtime >= FLASH_TIME*2/3)) highlight = 1; + + /* Highlight active input areas. */ if (x == ui->hx && y == ui->hy) highlight = ui->hpencil ? 2 : 1; + + /* Mark obvious errors (ie, numbers which occur more than once + * in a single row, column, or box). */ + if ((ds->entered_items[x*cr+d-1] & 2) || + (ds->entered_items[y*cr+d-1] & 8) || + (ds->entered_items[((x/r)+(y/c)*c)*cr+d-1] & 32)) + highlight |= 16; + draw_number(fe, ds, state, x, y, highlight); } } @@ -2267,7 +2356,7 @@ int main(int argc, char **argv) fprintf(stderr, "%s: %s\n", argv[0], err); return 1; } - s = new_game(p, desc); + s = new_game(NULL, p, desc); if (recurse) { int ret = rsolve(p->c, p->r, s->grid, NULL, 2);