X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/62f8425eb6bfb7abdab675e7c7775910b8f0bc93..e64991db95a699e4ea966a2406bfbe6bf5035f87:/latin.c diff --git a/latin.c b/latin.c index 116cdae..03d78af 100644 --- a/latin.c +++ b/latin.c @@ -16,6 +16,12 @@ * Solver. */ +static int latin_solver_top(struct latin_solver *solver, int maxdiff, + int diff_simple, int diff_set_0, int diff_set_1, + int diff_forcing, int diff_recursive, + usersolver_t const *usersolvers, void *ctx, + ctxnew_t ctxnew, ctxfree_t ctxfree); + #ifdef STANDALONE_SOLVER int solver_show_working, solver_recurse_depth; #endif @@ -56,7 +62,7 @@ void latin_solver_place(struct latin_solver *solver, int x, int y, int n) /* * Enter the number in the result grid. */ - solver->grid[YUNTRANS(y)*o+x] = n; + solver->grid[y*o+x] = n; /* * Cross out this number from the list of numbers left to place @@ -72,6 +78,9 @@ int latin_solver_elim(struct latin_solver *solver, int start, int step ) { int o = solver->o; +#ifdef STANDALONE_SOLVER + char **names = solver->names; +#endif int fpos, m, i; /* @@ -95,7 +104,7 @@ int latin_solver_elim(struct latin_solver *solver, int start, int step x = y / o; y %= o; - if (!solver->grid[YUNTRANS(y)*o+x]) { + if (!solver->grid[y*o+x]) { #ifdef STANDALONE_SOLVER if (solver_show_working) { va_list ap; @@ -103,8 +112,9 @@ int latin_solver_elim(struct latin_solver *solver, int start, int step va_start(ap, fmt); vprintf(fmt, ap); va_end(ap); - printf(":\n%*s placing %d at (%d,%d)\n", - solver_recurse_depth*4, "", n, x, YUNTRANS(y)); + printf(":\n%*s placing %s at (%d,%d)\n", + solver_recurse_depth*4, "", names[n-1], + x+1, y+1); } #endif latin_solver_place(solver, x, y, n); @@ -145,6 +155,9 @@ int latin_solver_set(struct latin_solver *solver, ) { int o = solver->o; +#ifdef STANDALONE_SOLVER + char **names = solver->names; +#endif int i, j, n, count; unsigned char *grid = scratch->grid; unsigned char *rowidx = scratch->rowidx; @@ -292,9 +305,9 @@ int latin_solver_set(struct latin_solver *solver, px = py / o; py %= o; - printf("%*s ruling out %d at (%d,%d)\n", + printf("%*s ruling out %s at (%d,%d)\n", solver_recurse_depth*4, "", - pn, px, YUNTRANS(py)); + names[pn-1], px+1, py+1); } #endif progress = TRUE; @@ -365,6 +378,9 @@ int latin_solver_forcing(struct latin_solver *solver, struct latin_solver_scratch *scratch) { int o = solver->o; +#ifdef STANDALONE_SOLVER + char **names = solver->names; +#endif int *bfsqueue = scratch->bfsqueue; #ifdef STANDALONE_SOLVER int *bfsprev = scratch->bfsprev; @@ -485,13 +501,14 @@ int latin_solver_forcing(struct latin_solver *solver, if (solver_show_working) { char *sep = ""; int xl, yl; - printf("%*sforcing chain, %d at ends of ", - solver_recurse_depth*4, "", orign); + printf("%*sforcing chain, %s at ends of ", + solver_recurse_depth*4, "", + names[orign-1]); xl = xx; yl = yy; while (1) { - printf("%s(%d,%d)", sep, xl, - YUNTRANS(yl)); + printf("%s(%d,%d)", sep, xl+1, + yl+1); xl = bfsprev[yl*o+xl]; if (xl < 0) break; @@ -499,9 +516,10 @@ int latin_solver_forcing(struct latin_solver *solver, xl %= o; sep = "-"; } - printf("\n%*s ruling out %d at (%d,%d)\n", + printf("\n%*s ruling out %s at (%d,%d)\n", solver_recurse_depth*4, "", - orign, xt, YUNTRANS(yt)); + names[orign-1], + xt+1, yt+1); } #endif cube(xt, yt, orign) = FALSE; @@ -562,7 +580,11 @@ void latin_solver_alloc(struct latin_solver *solver, digit *grid, int o) for (x = 0; x < o; x++) for (y = 0; y < o; y++) if (grid[y*o+x]) - latin_solver_place(solver, x, YTRANS(y), grid[y*o+x]); + latin_solver_place(solver, x, y, grid[y*o+x]); + +#ifdef STANDALONE_SOLVER + solver->names = NULL; +#endif } void latin_solver_free(struct latin_solver *solver) @@ -575,6 +597,10 @@ void latin_solver_free(struct latin_solver *solver) int latin_solver_diff_simple(struct latin_solver *solver) { int x, y, n, ret, o = solver->o; +#ifdef STANDALONE_SOLVER + char **names = solver->names; +#endif + /* * Row-wise positional elimination. */ @@ -584,7 +610,8 @@ int latin_solver_diff_simple(struct latin_solver *solver) ret = latin_solver_elim(solver, cubepos(0,y,n), o*o #ifdef STANDALONE_SOLVER , "positional elimination," - " %d in row %d", n, YUNTRANS(y) + " %s in row %d", names[n-1], + y+1 #endif ); if (ret != 0) return ret; @@ -598,7 +625,7 @@ int latin_solver_diff_simple(struct latin_solver *solver) ret = latin_solver_elim(solver, cubepos(x,0,n), o #ifdef STANDALONE_SOLVER , "positional elimination," - " %d in column %d", n, x + " %s in column %d", names[n-1], x+1 #endif ); if (ret != 0) return ret; @@ -609,11 +636,11 @@ int latin_solver_diff_simple(struct latin_solver *solver) */ for (x = 0; x < o; x++) for (y = 0; y < o; y++) - if (!solver->grid[YUNTRANS(y)*o+x]) { + if (!solver->grid[y*o+x]) { ret = latin_solver_elim(solver, cubepos(x,y,1), 1 #ifdef STANDALONE_SOLVER - , "numeric elimination at (%d,%d)", x, - YUNTRANS(y) + , "numeric elimination at (%d,%d)", + x+1, y+1 #endif ); if (ret != 0) return ret; @@ -626,6 +653,9 @@ int latin_solver_diff_set(struct latin_solver *solver, int extreme) { int x, y, n, ret, o = solver->o; +#ifdef STANDALONE_SOLVER + char **names = solver->names; +#endif if (!extreme) { /* @@ -634,7 +664,7 @@ int latin_solver_diff_set(struct latin_solver *solver, for (y = 0; y < o; y++) { ret = latin_solver_set(solver, scratch, cubepos(0,y,1), o*o, 1 #ifdef STANDALONE_SOLVER - , "set elimination, row %d", YUNTRANS(y) + , "set elimination, row %d", y+1 #endif ); if (ret != 0) return ret; @@ -645,7 +675,7 @@ int latin_solver_diff_set(struct latin_solver *solver, for (x = 0; x < o; x++) { ret = latin_solver_set(solver, scratch, cubepos(x,0,1), o, 1 #ifdef STANDALONE_SOLVER - , "set elimination, column %d", x + , "set elimination, column %d", x+1 #endif ); if (ret != 0) return ret; @@ -658,7 +688,8 @@ int latin_solver_diff_set(struct latin_solver *solver, for (n = 1; n <= o; n++) { ret = latin_solver_set(solver, scratch, cubepos(0,0,n), o*o, o #ifdef STANDALONE_SOLVER - , "positional set elimination, number %d", n + , "positional set elimination on %s", + names[n-1] #endif ); if (ret != 0) return ret; @@ -685,6 +716,9 @@ static int latin_solver_recurse { int best, bestcount; int o = solver->o, x, y, n; +#ifdef STANDALONE_SOLVER + char **names = solver->names; +#endif best = -1; bestcount = o+1; @@ -700,7 +734,7 @@ static int latin_solver_recurse */ count = 0; for (n = 1; n <= o; n++) - if (cube(x,YTRANS(y),n)) + if (cube(x,y,n)) count++; /* @@ -736,16 +770,16 @@ static int latin_solver_recurse /* Make a list of the possible digits. */ for (j = 0, n = 1; n <= o; n++) - if (cube(x,YTRANS(y),n)) + if (cube(x,y,n)) list[j++] = n; #ifdef STANDALONE_SOLVER if (solver_show_working) { char *sep = ""; printf("%*srecursing on (%d,%d) [", - solver_recurse_depth*4, "", x, y); + solver_recurse_depth*4, "", x+1, y+1); for (i = 0; i < j; i++) { - printf("%s%d", sep, list[i]); + printf("%s%s", sep, names[list[i]-1]); sep = " or "; } printf("]\n"); @@ -759,14 +793,15 @@ static int latin_solver_recurse for (i = 0; i < j; i++) { int ret; void *newctx; + struct latin_solver subsolver; memcpy(outgrid, ingrid, o*o); outgrid[y*o+x] = list[i]; #ifdef STANDALONE_SOLVER if (solver_show_working) - printf("%*sguessing %d at (%d,%d)\n", - solver_recurse_depth*4, "", list[i], x, y); + printf("%*sguessing %s at (%d,%d)\n", + solver_recurse_depth*4, "", names[list[i]-1], x+1, y+1); solver_recurse_depth++; #endif @@ -775,18 +810,23 @@ static int latin_solver_recurse } else { newctx = ctx; } - ret = latin_solver(outgrid, o, diff_recursive, - diff_simple, diff_set_0, diff_set_1, - diff_forcing, diff_recursive, - usersolvers, newctx, ctxnew, ctxfree); + latin_solver_alloc(&subsolver, outgrid, o); +#ifdef STANDALONE_SOLVER + subsolver.names = solver->names; +#endif + ret = latin_solver_top(&subsolver, diff_recursive, + diff_simple, diff_set_0, diff_set_1, + diff_forcing, diff_recursive, + usersolvers, newctx, ctxnew, ctxfree); + latin_solver_free(&subsolver); if (ctxnew) ctxfree(newctx); #ifdef STANDALONE_SOLVER solver_recurse_depth--; if (solver_show_working) { - printf("%*sretracting %d at (%d,%d)\n", - solver_recurse_depth*4, "", list[i], x, y); + printf("%*sretracting %s at (%d,%d)\n", + solver_recurse_depth*4, "", names[list[i]-1], x+1, y+1); } #endif /* we recurse as deep as we can, so we should never find @@ -836,11 +876,11 @@ static int latin_solver_recurse } } -int latin_solver_main(struct latin_solver *solver, int maxdiff, - int diff_simple, int diff_set_0, int diff_set_1, - int diff_forcing, int diff_recursive, - usersolver_t const *usersolvers, void *ctx, - ctxnew_t ctxnew, ctxfree_t ctxfree) +static int latin_solver_top(struct latin_solver *solver, int maxdiff, + int diff_simple, int diff_set_0, int diff_set_1, + int diff_forcing, int diff_recursive, + usersolver_t const *usersolvers, void *ctx, + ctxnew_t ctxnew, ctxfree_t ctxfree) { struct latin_solver_scratch *scratch = latin_solver_new_scratch(solver); int ret, diff = diff_simple; @@ -938,6 +978,48 @@ int latin_solver_main(struct latin_solver *solver, int maxdiff, return diff; } +int latin_solver_main(struct latin_solver *solver, int maxdiff, + int diff_simple, int diff_set_0, int diff_set_1, + int diff_forcing, int diff_recursive, + usersolver_t const *usersolvers, void *ctx, + ctxnew_t ctxnew, ctxfree_t ctxfree) +{ + int diff; +#ifdef STANDALONE_SOLVER + int o = solver->o; + char *text = NULL, **names = NULL; +#endif + +#ifdef STANDALONE_SOLVER + if (!solver->names) { + char *p; + int i; + + text = snewn(40 * o, char); + p = text; + + solver->names = snewn(o, char *); + + for (i = 0; i < o; i++) { + solver->names[i] = p; + p += 1 + sprintf(p, "%d", i+1); + } + } +#endif + + diff = latin_solver_top(solver, maxdiff, + diff_simple, diff_set_0, diff_set_1, + diff_forcing, diff_recursive, + usersolvers, ctx, ctxnew, ctxfree); + +#ifdef STANDALONE_SOLVER + sfree(names); + sfree(text); +#endif + + return diff; +} + int latin_solver(digit *grid, int o, int maxdiff, int diff_simple, int diff_set_0, int diff_set_1, int diff_forcing, int diff_recursive, @@ -1154,6 +1236,24 @@ digit *latin_generate(int o, random_state *rs) return sq; } +digit *latin_generate_rect(int w, int h, random_state *rs) +{ + int o = max(w, h), x, y; + digit *latin, *latin_rect; + + latin = latin_generate(o, rs); + latin_rect = snewn(w*h, digit); + + for (x = 0; x < w; x++) { + for (y = 0; y < h; y++) { + latin_rect[y*w + x] = latin[y*o + x]; + } + } + + sfree(latin); + return latin_rect; +} + /* -------------------------------------------------------- * Checking. */