Towers: fill in the latin.c validator function.

Again, this seems to have made no difference in a test generation run
with the command "towers --generate 100 6du#12345".

diff --git a/towers.c b/towers.c
index 27d875150a28af87b58da8457b7e7ee010b7c3ba..aee088fb54a6d18508818ef15ef407f3a64a9d38 100644 (file)
--- a/towers.c
+++ b/towers.c
@@ -574,9 +574,36 @@ static int solver_hard(struct latin_solver *solver, void *vctx)
 #define SOLVER(upper,title,func,lower) func,
 static usersolver_t const towers_solvers[] = { DIFFLIST(SOLVER) };
 
-static bool towers_valid(struct latin_solver *solver, void *ctx)
+static bool towers_valid(struct latin_solver *solver, void *vctx)
 {
-    return true;                       /* FIXME */
+    struct solver_ctx *ctx = (struct solver_ctx *)vctx;
+    int w = ctx->w;
+    int c, i, n, best, clue, start, step;
+    for (c = 0; c < 4*w; c++) {
+       clue = ctx->clues[c];
+       if (!clue)
+           continue;
+
+        STARTSTEP(start, step, c, w);
+        n = best = 0;
+        for (i = 0; i < w; i++) {
+            if (solver->grid[start+i*step] > best) {
+                best = solver->grid[start+i*step];
+                n++;
+            }
+        }
+
+        if (n != clue) {
+#ifdef STANDALONE_SOLVER
+            if (solver_show_working)
+               printf("%*sclue %s %d is violated\n",
+                       solver_recurse_depth*4, "",
+                       cluepos[c/w], c%w+1);
+#endif
+            return false;
+        }
+    }
+    return true;
 }
 
 static int solver(int w, int *clues, digit *soln, int maxdiff)