zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-22 00:15:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

Some minor fixes to the unfinished Pearl solver:

Browse Source 
- move critical correctness checks out of diagnostic ifdefs (ahem)
 - move declarations to before conditionally compiled code (we don't
   build in C99 mode round here)
 - tidy up an unsightly blank line while I'm here.

[originally from svn r8969]
This commit is contained in:
Simon Tatham
2010-06-27 11:17:27 +00:00
parent 3dc6adba5e
commit 795ef3c137
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
unfinished/pearl.c
View File

@ -217,6 +217,7 @@ int pearl_solve(int w, int h, char *clues, char *result)
* Now repeatedly try to find something we can do.
*/
while (1) {
int done_something = FALSE;
#ifdef SOLVER_DIAGNOSTICS
for (y = 0; y < H; y++) {
@ -226,8 +227,6 @@ int pearl_solve(int w, int h, char *clues, char *result)
}
#endif
int done_something = FALSE;
/*
* Go through the square state words, and discard any
* square state which is inconsistent with known facts
@ -267,9 +266,9 @@ int pearl_solve(int w, int h, char *clues, char *result)
if (!workspace[(2*y+1)*W+(2*x+1)]) {
#ifdef SOLVER_DIAGNOSTICS
printf("edge check at (%d,%d): inconsistency\n", x, y);
#endif
ret = 0;
goto cleanup;
#endif
}
}
@ -298,9 +297,9 @@ int pearl_solve(int w, int h, char *clues, char *result)
if (edgeand & ~edgeor) {
#ifdef SOLVER_DIAGNOSTICS
printf("square check at (%d,%d): inconsistency\n", x, y);
#endif
ret = 0;
goto cleanup;
#endif
}
for (d = 1; d <= 8; d += d) {
@ -385,7 +384,6 @@ int pearl_solve(int w, int h, char *clues, char *result)
}
}
break;
case STRAIGHT:
/*