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

Pearl: re-use a single grid structure when generating

Browse Source 
Pearl generally has to generate quite a lot of candidate loops before
it can find one that makes a viable puzzle.  Before this change it
generated a new grid structure for each of those candidate loops.  The
result was that grid_new() accounted for over 5% of the
puzzle-generation time.

Pulling grid_new() out of the loop-generation loop makes "pearl
--generate 100 8x8dt#0" about 6% faster on my laptop, while producing
precisely the same output.  Most of this change is just renaming the
"grid" variable in new_clues() so it doesn't collide with the typedef
of the same name.
This commit is contained in:
Ben Harris
2023-08-06 13:30:38 +01:00
parent ff860360c3
commit 6d4b20c413
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
pearl.c
View File

@ -1087,9 +1087,8 @@ static int pearl_loopgen_bias(void *vctx, char *board, int face)
return ctx->score; return ctx->score;
} }
static void pearl_loopgen(int w, int h, char *lines, random_state *rs) static void pearl_loopgen(int w, int h, char *lines, random_state *rs, grid *g)
{ {
grid *g = grid_new(GRID_SQUARE, w-1, h-1, NULL);
char *board = snewn(g->num_faces, char); char *board = snewn(g->num_faces, char);
int i, s = g->tilesize; int i, s = g->tilesize;
struct pearl_loopgen_bias_ctx biasctx; struct pearl_loopgen_bias_ctx biasctx;
@ -1169,7 +1168,6 @@ static void pearl_loopgen(int w, int h, char *lines, random_state *rs)
} }
} }
grid_free(g);
sfree(board); sfree(board);
#if defined LOOPGEN_DIAGNOSTICS && !defined GENERATION_DIAGNOSTICS #if defined LOOPGEN_DIAGNOSTICS && !defined GENERATION_DIAGNOSTICS
@ -1192,11 +1190,11 @@ static void pearl_loopgen(int w, int h, char *lines, random_state *rs)
} }
static int new_clues(const game_params *params, random_state *rs, static int new_clues(const game_params *params, random_state *rs,
char *clues, char *grid) char *clues, char *grid_out)
{ {
int w = params->w, h = params->h, diff = params->difficulty; int w = params->w, h = params->h, diff = params->difficulty;
int ngen = 0, x, y, d, ret, i; int ngen = 0, x, y, d, ret, i;
grid *g = grid_new(GRID_SQUARE, w-1, h-1, NULL);
/* /*
* Difficulty exception: 5x5 Tricky is not generable (the * Difficulty exception: 5x5 Tricky is not generable (the
@ -1207,13 +1205,13 @@ static int new_clues(const game_params *params, random_state *rs,
while (1) { while (1) {
ngen++; ngen++;
pearl_loopgen(w, h, grid, rs); pearl_loopgen(w, h, grid_out, rs, g);
#ifdef GENERATION_DIAGNOSTICS #ifdef GENERATION_DIAGNOSTICS
printf("grid array:\n"); printf("grid array:\n");
for (y = 0; y < h; y++) { for (y = 0; y < h; y++) {
for (x = 0; x < w; x++) { for (x = 0; x < w; x++) {
int type = grid[y*w+x]; int type = grid_out[y*w+x];
char s[5], *p = s; char s[5], *p = s;
if (type & L) *p++ = 'L'; if (type & L) *p++ = 'L';
if (type & R) *p++ = 'R'; if (type & R) *p++ = 'R';
@ -1232,7 +1230,7 @@ static int new_clues(const game_params *params, random_state *rs,
*/ */
for (y = 0; y < h; y++) for (y = 0; y < h; y++)
for (x = 0; x < w; x++) { for (x = 0; x < w; x++) {
int type = grid[y*w+x]; int type = grid_out[y*w+x];
clues[y*w+x] = NOCLUE; clues[y*w+x] = NOCLUE;
@ -1246,7 +1244,7 @@ static int new_clues(const game_params *params, random_state *rs,
for (d = 1; d <= 8; d += d) if (type & d) { for (d = 1; d <= 8; d += d) if (type & d) {
int xx = x + DX(d), yy = y + DY(d); int xx = x + DX(d), yy = y + DY(d);
assert(xx >= 0 && xx < w && yy >= 0 && yy < h); assert(xx >= 0 && xx < w && yy >= 0 && yy < h);
if ((bLU|bLD|bRU|bRD) & (1 << grid[yy*w+xx])) if ((bLU|bLD|bRU|bRD) & (1 << grid_out[yy*w+xx]))
break; break;
} }
if (d <= 8) /* we found one */ if (d <= 8) /* we found one */
@ -1260,7 +1258,7 @@ static int new_clues(const game_params *params, random_state *rs,
for (d = 1; d <= 8; d += d) if (type & d) { for (d = 1; d <= 8; d += d) if (type & d) {
int xx = x + DX(d), yy = y + DY(d); int xx = x + DX(d), yy = y + DY(d);
assert(xx >= 0 && xx < w && yy >= 0 && yy < h); assert(xx >= 0 && xx < w && yy >= 0 && yy < h);
if (!((bLR|bUD) & (1 << grid[yy*w+xx]))) if (!((bLR|bUD) & (1 << grid_out[yy*w+xx])))
break; break;
} }
if (d > 8) /* we didn't find a counterexample */ if (d > 8) /* we didn't find a counterexample */
@ -1286,7 +1284,7 @@ static int new_clues(const game_params *params, random_state *rs,
/* /*
* See if we can solve the puzzle just like this. * See if we can solve the puzzle just like this.
*/ */
ret = pearl_solve(w, h, clues, grid, diff, false); ret = pearl_solve(w, h, clues, grid_out, diff, false);
assert(ret > 0); /* shouldn't be inconsistent! */ assert(ret > 0); /* shouldn't be inconsistent! */
if (ret != 1) if (ret != 1)
continue; /* go round and try again */ continue; /* go round and try again */
@ -1295,7 +1293,7 @@ static int new_clues(const game_params *params, random_state *rs,
* Check this puzzle isn't too easy. * Check this puzzle isn't too easy.
*/ */
if (diff > DIFF_EASY) { if (diff > DIFF_EASY) {
ret = pearl_solve(w, h, clues, grid, diff-1, false); ret = pearl_solve(w, h, clues, grid_out, diff-1, false);
assert(ret > 0); assert(ret > 0);
if (ret == 1) if (ret == 1)
continue; /* too easy: try again */ continue; /* too easy: try again */
@ -1362,7 +1360,7 @@ static int new_clues(const game_params *params, random_state *rs,
clue = clues[y*w+x]; clue = clues[y*w+x];
clues[y*w+x] = 0; /* try removing this clue */ clues[y*w+x] = 0; /* try removing this clue */
ret = pearl_solve(w, h, clues, grid, diff, false); ret = pearl_solve(w, h, clues, grid_out, diff, false);
assert(ret > 0); assert(ret > 0);
if (ret != 1) if (ret != 1)
clues[y*w+x] = clue; /* oops, put it back again */ clues[y*w+x] = clue; /* oops, put it back again */
@ -1383,6 +1381,7 @@ static int new_clues(const game_params *params, random_state *rs,
break; /* got it */ break; /* got it */
} }
grid_free(g);
debug(("%d %dx%d loops before finished puzzle.\n", ngen, w, h)); debug(("%d %dx%d loops before finished puzzle.\n", ngen, w, h));