Use LUT for group indexes instead of calculating on-the-fly
This commit is contained in:
139
solve.c
139
solve.c
@@ -17,14 +17,15 @@
|
||||
*/
|
||||
|
||||
#include "solve.h"
|
||||
#include "lut.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
static void setpval(struct sudoku *sud, unsigned r, unsigned c, uint16_t pval)
|
||||
static void setpval(struct sudoku *sud, unsigned i, uint16_t pval)
|
||||
{
|
||||
for (unsigned val = 0; val < NDIGITS; ++val) {
|
||||
if (pval & 1) {
|
||||
update(sud, r, c, val);
|
||||
update(sud, i, val);
|
||||
return;
|
||||
}
|
||||
pval >>= 1;
|
||||
@@ -33,86 +34,80 @@ static void setpval(struct sudoku *sud, unsigned r, unsigned c, uint16_t pval)
|
||||
|
||||
int solve(struct sudoku *sud)
|
||||
{
|
||||
unsigned r, c, n, i, j, val, sr, sc;
|
||||
unsigned n, i, j, val;
|
||||
bool match;
|
||||
uint16_t valmask, pvals;
|
||||
|
||||
for (n = 0;; ++n) {
|
||||
match = false;
|
||||
|
||||
for (r = 0; r < NDIGITS; ++r) {
|
||||
for (c = 0; c < NDIGITS; ++c) {
|
||||
if (DET(sud->cells[r][c]))
|
||||
continue;
|
||||
for (i = 0; i < NCELLS; ++i) {
|
||||
if (DET(sud->cells[i]))
|
||||
continue;
|
||||
|
||||
/*
|
||||
* Check if there's only one possible value this cell
|
||||
* can have.
|
||||
*/
|
||||
pvals = sud->cells[r][c] & PVALSMASK;
|
||||
for (val = 0; val < NDIGITS; ++val) {
|
||||
if (pvals & 1) {
|
||||
if (pvals == 1) {
|
||||
update(sud, r, c, val);
|
||||
match = true;
|
||||
goto next_cell;
|
||||
}
|
||||
break;
|
||||
/*
|
||||
* Check if there's only one possible value this cell
|
||||
* can have.
|
||||
*/
|
||||
pvals = sud->cells[i] & PVALSMASK;
|
||||
for (val = 0; val < NDIGITS; ++val) {
|
||||
if (pvals & 1) {
|
||||
if (pvals == 1) {
|
||||
update(sud, i, val);
|
||||
match = true;
|
||||
goto next_cell;
|
||||
}
|
||||
pvals >>= 1;
|
||||
break;
|
||||
}
|
||||
|
||||
/*
|
||||
* Check if there's a possible value unique to this
|
||||
* cell in its row.
|
||||
*/
|
||||
valmask = 0;
|
||||
for (i = 0; i < NDIGITS; ++i) {
|
||||
if (i != r && !DET(sud->cells[i][c]))
|
||||
valmask |= sud->cells[i][c];
|
||||
}
|
||||
if ((pvals = sud->cells[r][c] & ~valmask)) {
|
||||
setpval(sud, r, c, pvals);
|
||||
match = true;
|
||||
continue;
|
||||
}
|
||||
|
||||
/*
|
||||
* Check if there's a possible value unique to this
|
||||
* cell in its column.
|
||||
*/
|
||||
valmask = 0;
|
||||
for (i = 0; i < NDIGITS; ++i) {
|
||||
if (i != c && !DET(sud->cells[r][i]))
|
||||
valmask |= sud->cells[r][i];
|
||||
}
|
||||
if ((pvals = sud->cells[r][c] & ~valmask)) {
|
||||
setpval(sud, r, c, pvals);
|
||||
match = true;
|
||||
continue;
|
||||
}
|
||||
|
||||
/*
|
||||
* Check if there's a possible value unique to this
|
||||
* cell in its segment.
|
||||
*/
|
||||
sr = SEGLEN * (r / SEGLEN);
|
||||
sc = SEGLEN * (c / SEGLEN);
|
||||
valmask = 0;
|
||||
for (i = sr; i < sr + SEGLEN; ++i) {
|
||||
for (j = sc; j < sc + SEGLEN; ++j) {
|
||||
if ((i != r || j != c) && !DET(sud->cells[i][j]))
|
||||
valmask |= sud->cells[i][j];
|
||||
}
|
||||
}
|
||||
if ((pvals = sud->cells[r][c] & ~valmask)) {
|
||||
setpval(sud, r, c, pvals);
|
||||
match = true;
|
||||
continue;
|
||||
}
|
||||
|
||||
next_cell:;
|
||||
pvals >>= 1;
|
||||
}
|
||||
|
||||
/*
|
||||
* Check if there's a possible value unique to this
|
||||
* cell in its row.
|
||||
*/
|
||||
valmask = 0;
|
||||
for (j = 0; j < NGROUP; ++j) {
|
||||
if (!DET(sud->cells[rowidx_lut[i][j]]))
|
||||
valmask |= sud->cells[rowidx_lut[i][j]];
|
||||
}
|
||||
if ((pvals = sud->cells[i] & ~valmask)) {
|
||||
setpval(sud, i, pvals);
|
||||
match = true;
|
||||
continue;
|
||||
}
|
||||
|
||||
/*
|
||||
* Check if there's a possible value unique to this
|
||||
* cell in its column.
|
||||
*/
|
||||
valmask = 0;
|
||||
for (j = 0; j < NGROUP; ++j) {
|
||||
if (!DET(sud->cells[colidx_lut[i][j]]))
|
||||
valmask |= sud->cells[colidx_lut[i][j]];
|
||||
}
|
||||
if ((pvals = sud->cells[i] & ~valmask)) {
|
||||
setpval(sud, i, pvals);
|
||||
match = true;
|
||||
continue;
|
||||
}
|
||||
|
||||
/*
|
||||
* Check if there's a possible value unique to this
|
||||
* cell in its segment.
|
||||
*/
|
||||
valmask = 0;
|
||||
for (j = 0; j < NGROUP; ++j) {
|
||||
if (!DET(sud->cells[segidx_lut[i][j]]))
|
||||
valmask |= sud->cells[segidx_lut[i][j]];
|
||||
}
|
||||
if ((pvals = sud->cells[i] & ~valmask)) {
|
||||
setpval(sud, i, pvals);
|
||||
match = true;
|
||||
continue;
|
||||
}
|
||||
|
||||
next_cell:;
|
||||
}
|
||||
|
||||
/* Exit if no matches. */
|
||||
|
||||
Reference in New Issue
Block a user