From 69773d855b517ea356c3c02add97893201de2066 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Sat, 28 Oct 2017 11:36:47 +0100
Subject: [PATCH] Solo: remove some overzealous assertions in the solver.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There were a couple of places where we enforced by assertion that our
solver state had not become inconsistent, on the assumption that some
previous piece of solver would have detected that the puzzle was
impossible before getting to that place in the code.

But in fact the combination of Killer and Unreasonable modes falsified
at least two of those assumptions: 'solo --test-solve --generate 100
3x3kdu#12345' triggered an assertion failure in solver_set, and with
that one fixed, the same command triggered a second failure in
solver_killer_sums.

In both cases, the fix is simply to return -1 for 'puzzle is
inconsistent', which will cause the Unreasonable recursive solver to
abandon that branch of its search tree, backtrack, and try a different
guess at some previous square.

Thanks to Anders Höglund for the report.
---
 solo.c | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/solo.c b/solo.c
index ef2852f..dd04cdf 100644
--- a/solo.c
+++ b/solo.c
@@ -1013,12 +1013,23 @@ static int solver_set(struct solver_usage *usage,
 
 	/*
 	 * If count == 0, then there's a row with no 1s at all and
-	 * the puzzle is internally inconsistent. However, we ought
-	 * to have caught this already during the simpler reasoning
-	 * methods, so we can safely fail an assertion if we reach
-	 * this point here.
+	 * the puzzle is internally inconsistent.
 	 */
-	assert(count > 0);
+        if (count == 0) {
+#ifdef STANDALONE_SOLVER
+            if (solver_show_working) {
+                va_list ap;
+                printf("%*s", solver_recurse_depth*4,
+                       "");
+                va_start(ap, fmt);
+                vprintf(fmt, ap);
+                va_end(ap);
+                printf(":\n%*s  solver_set: impossible on entry\n",
+                       solver_recurse_depth*4, "");
+            }
+#endif
+            return -1;
+        }
         if (count == 1)
             rowidx[i] = colidx[first] = FALSE;
     }
@@ -1465,7 +1476,14 @@ static int solver_killer_sums(struct solver_usage *usage, int b,
 	assert(nsquares == 0);
 	return 0;
     }
-    assert(nsquares > 0);
+    if (nsquares == 0) {
+#ifdef STANDALONE_SOLVER
+        if (solver_show_working)
+            printf("%*skiller: cage has no usable squares left\n",
+                   solver_recurse_depth*4, "");
+#endif
+        return -1;
+    }
 
     if (nsquares < 2 || nsquares > 4)
 	return 0;