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

Dominosa: prevent hangs generating tiny hard puzzles.

Browse Source 
As with several other puzzles, the harder difficulty levels turn out
to be impossible to generate at very small sizes, which I fudge by
replacing them with the hardest level actually feasible.
This commit is contained in:
Simon Tatham
2019-04-05 19:40:59 +01:00
parent 191843e0c7
commit 97a36f1cd2
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
dominosa.c
View File

@ -1454,12 +1454,28 @@ static int run_solver(struct solver_scratch *sc, int max_diff_allowed)
static char *new_game_desc(const game_params *params, random_state *rs, static char *new_game_desc(const game_params *params, random_state *rs,
char **aux, bool interactive) char **aux, bool interactive)
{ {
int n = params->n, w = n+2, h = n+1, wh = w*h; int n = params->n, w = n+2, h = n+1, wh = w*h, diff = params->diff;
int *grid, *grid2, *list; int *grid, *grid2, *list;
struct solver_scratch *sc; struct solver_scratch *sc;
int i, j, k, len; int i, j, k, len;
char *ret; char *ret;
#ifndef OMIT_DIFFICULTY_CAP
/*
* Cap the difficulty level for small puzzles which would
* otherwise become impossible to generate.
*
* Under an #ifndef, to make it easy to remove this cap for the
* purpose of re-testing what it ought to be.
*/
if (diff != DIFF_AMBIGUOUS) {
if (n == 1 && diff > DIFF_TRIVIAL)
diff = DIFF_TRIVIAL;
if (n == 2 && diff > DIFF_BASIC)
diff = DIFF_BASIC;
}
#endif /* OMIT_DIFFICULTY_CAP */
/* /*
* Allocate space in which to lay the grid out. * Allocate space in which to lay the grid out.
*/ */
@ -1518,7 +1534,7 @@ static char *new_game_desc(const game_params *params, random_state *rs,
/* Optionally flip the domino round. */ /* Optionally flip the domino round. */
int flip = -1; int flip = -1;
if (params->diff != DIFF_AMBIGUOUS) { if (diff != DIFF_AMBIGUOUS) {
int t1, t2; int t1, t2;
/* /*
* If we're after a unique solution, we can do * If we're after a unique solution, we can do
@ -1577,9 +1593,8 @@ static char *new_game_desc(const game_params *params, random_state *rs,
} }
assert(j == k); assert(j == k);
solver_setup_grid(sc, grid2); solver_setup_grid(sc, grid2);
} while (params->diff != DIFF_AMBIGUOUS && } while (diff != DIFF_AMBIGUOUS &&
(run_solver(sc, params->diff) > 1 || (run_solver(sc, diff) > 1 || sc->max_diff_used < diff));
sc->max_diff_used < params->diff));
solver_free_scratch(sc); solver_free_scratch(sc);