zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-20 23:51:29 -07:00
Code Issues Packages Projects Releases Wiki Activity

Pattern: fix solver's handling of empty rows.

Browse Source 
The algorithm for deducing how many squares in a row could be filled
in just from the initial clue set was focusing solely on _black_
squares, and forgot that if a row has a totally empty clue square then
everything in it can be filled in as white!

Now the solver can cope with puzzles such as 3x3:/1///1/ , where it
would previously have spuriously considered that it had no idea where
to start.
This commit is contained in:
Simon Tatham
2015-12-11 18:54:56 +00:00
parent a845e6476d
commit d1219cac3c
1 changed files with 36 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
pattern.c
View File

@ -441,7 +441,12 @@ static int do_row(unsigned char *known, unsigned char *deduced,
for (i = len - 1; i >= 0 && known[i] == DOT; i--) for (i = len - 1; i >= 0 && known[i] == DOT; i--)
freespace--; freespace--;
do_recurse(known, deduced, row, minpos_done, maxpos_done, minpos_ok, maxpos_ok, data, len, freespace, 0, 0); if (rowlen == 0) {
memset(deduced, DOT, len);
} else {
do_recurse(known, deduced, row, minpos_done, maxpos_done, minpos_ok,
maxpos_ok, data, len, freespace, 0, 0);
}
done_any = FALSE; done_any = FALSE;
for (i=0; i<len; i++) for (i=0; i<len; i++)
@ -502,33 +507,45 @@ static int solve_puzzle(const game_state *state, unsigned char *grid,
* Changed_* is used to choose the next rows / cols to re-examine * Changed_* is used to choose the next rows / cols to re-examine
*/ */
for (i=0; i<h; i++) { for (i=0; i<h; i++) {
int freespace; int freespace, rowlen;
if (state) { if (state) {
memcpy(rowdata, state->common->rowdata + state->common->rowsize*(w+i), max*sizeof(int)); memcpy(rowdata, state->common->rowdata + state->common->rowsize*(w+i), max*sizeof(int));
rowdata[state->common->rowlen[w+i]] = 0; rowlen = state->common->rowlen[w+i];
} else { } else {
rowdata[compute_rowdata(rowdata, grid+i*w, w, 1)] = 0; rowlen = compute_rowdata(rowdata, grid+i*w, w, 1);
} }
for (j=0, freespace=w+1; rowdata[j]; j++) freespace -= rowdata[j] + 1; rowdata[rowlen] = 0;
for (j=0, changed_h[i]=0; rowdata[j]; j++) if (rowlen == 0) {
if (rowdata[j] > freespace) changed_h[i] = w;
changed_h[i] += rowdata[j] - freespace; } else {
for (j=0, freespace=w+1; rowdata[j]; j++)
freespace -= rowdata[j] + 1;
for (j=0, changed_h[i]=0; rowdata[j]; j++)
if (rowdata[j] > freespace)
changed_h[i] += rowdata[j] - freespace;
}
} }
for (i=0,max_h=0; i<h; i++) for (i=0,max_h=0; i<h; i++)
if (changed_h[i] > max_h) if (changed_h[i] > max_h)
max_h = changed_h[i]; max_h = changed_h[i];
for (i=0; i<w; i++) { for (i=0; i<w; i++) {
int freespace; int freespace, rowlen;
if (state) { if (state) {
memcpy(rowdata, state->common->rowdata + state->common->rowsize*i, max*sizeof(int)); memcpy(rowdata, state->common->rowdata + state->common->rowsize*i, max*sizeof(int));
rowdata[state->common->rowlen[i]] = 0; rowlen = state->common->rowlen[i];
} else { } else {
rowdata[compute_rowdata(rowdata, grid+i, h, w)] = 0; rowlen = compute_rowdata(rowdata, grid+i, h, w);
} }
for (j=0, freespace=h+1; rowdata[j]; j++) freespace -= rowdata[j] + 1; rowdata[rowlen] = 0;
for (j=0, changed_w[i]=0; rowdata[j]; j++) if (rowlen == 0) {
if (rowdata[j] > freespace) changed_w[i] = h;
changed_w[i] += rowdata[j] - freespace; } else {
for (j=0, freespace=h+1; rowdata[j]; j++)
freespace -= rowdata[j] + 1;
for (j=0, changed_w[i]=0; rowdata[j]; j++)
if (rowdata[j] > freespace)
changed_w[i] += rowdata[j] - freespace;
}
} }
for (i=0,max_w=0; i<w; i++) for (i=0,max_w=0; i<w; i++)
if (changed_w[i] > max_w) if (changed_w[i] > max_w)
@ -1897,8 +1914,10 @@ int main(int argc, char **argv)
*/ */
for (i = 0; i < (w+h); i++) { for (i = 0; i < (w+h); i++) {
char buf[80]; char buf[80];
for (thiswid = -1, j = 0; j < s->rowlen[i]; j++) for (thiswid = -1, j = 0; j < s->common->rowlen[i]; j++)
thiswid += sprintf(buf, " %d", s->rowdata[s->rowsize*i+j]); thiswid += sprintf
(buf, " %d",
s->common->rowdata[s->common->rowsize*i+j]);
if (cluewid < thiswid) if (cluewid < thiswid)
cluewid = thiswid; cluewid = thiswid;
} }