Chris Boyle reports an off-by-two error ('a Qui-Gon Jinx' :-) in

difficulty selection in Unequal's solver. I suspect I missed this
when I refactored latin.c and its callers.

[originally from svn r8906]

diff --git a/unequal.c b/unequal.c
index 57d8afc2631ff0d6a114a7563158872dade29ec6..f21f57906ff8efb8e766d2b5c8b4e59fbd731bd7 100644 (file)
--- a/unequal.c
+++ b/unequal.c
@@ -98,10 +98,9 @@ struct game_state {
 #define TITLE(upper,title,func,lower) #title,
 #define ENCODE(upper,title,func,lower) #lower
 #define CONFIG(upper,title,func,lower) ":" #title
-enum { DIFFLIST(ENUM) DIFF_IMPOSSIBLE = diff_impossible, DIFF_AMBIGUOUS = diff_ambiguous, DIFF_UNFINISHED = diff_unfinished };
+enum { DIFFLIST(ENUM) DIFFCOUNT, DIFF_IMPOSSIBLE = diff_impossible, DIFF_AMBIGUOUS = diff_ambiguous, DIFF_UNFINISHED = diff_unfinished };
 static char const *const unequal_diffnames[] = { DIFFLIST(TITLE) };
 static char const unequal_diffchars[] = DIFFLIST(ENCODE);
-#define DIFFCOUNT lenof(unequal_diffchars)
 #define DIFFCONFIG DIFFLIST(CONFIG)
 
 #define DEFAULT_PRESET 0
@@ -1310,7 +1309,7 @@ static char *solve_game(game_state *state, game_state *currstate,
         if (!(solved->flags[r] & F_IMMUTABLE))
             solved->nums[r] = 0;
     }
-    r = solver_state(solved, DIFFCOUNT);
+    r = solver_state(solved, DIFFCOUNT-1);   /* always use full solver */
     if (r > 0) ret = latin_desc(solved->nums, solved->order);
     free_game(solved);
     return ret;