Use uint16_t instead of struct for cell state

- Bits 0-8 are the possible values
- Bits 9-12 is the concrete value
- Bit 15 is 1 if the cell is determined
This commit is contained in:
2022-11-24 00:37:48 +00:00
parent 4a2cfb392f
commit f51e9a06b0
3 changed files with 49 additions and 41 deletions

16
solve.c
View File

@@ -24,6 +24,7 @@ int solve(struct sudoku *sud)
{
unsigned r, c, n, i, j, val, np, pr, pc;
bool match;
uint16_t valmask;
for (n = 0;; ++n) {
match = false;
@@ -31,9 +32,12 @@ int solve(struct sudoku *sud)
/* Check if only one place a value can go on each row. */
for (r = 0; r < NDIGITS; ++r) {
for (val = 0; val < NDIGITS; ++val) {
valmask = 1 << val;
np = 0;
for (c = 0; c < NDIGITS; ++c) {
if (!sud->cells[r][c].det && sud->cells[r][c].pvals[val]) {
if (!(sud->cells[r][c] & DETMASK)
&& sud->cells[r][c] & valmask) {
pr = r;
pc = c;
++np;
@@ -52,9 +56,12 @@ int solve(struct sudoku *sud)
/* Check if only one place a value can go on each column. */
for (c = 0; c < NDIGITS; ++c) {
for (val = 0; val < NDIGITS; ++val) {
valmask = 1 << val;
np = 0;
for (r = 0; r < NDIGITS; ++r) {
if (!sud->cells[r][c].det && sud->cells[r][c].pvals[val]) {
if (!(sud->cells[r][c] & DETMASK)
&& sud->cells[r][c] & valmask) {
pr = r;
pc = c;
++np;
@@ -73,11 +80,14 @@ int solve(struct sudoku *sud)
/* Check if only one place a value can go in each segment. */
for (i = 0; i < NDIGITS; ++i) {
for (val = 0; val < NDIGITS; ++val) {
valmask = 1 << val;
np = 0;
for (j = 0; j < NDIGITS; ++j) {
r = SEGLEN * (i / SEGLEN) + j / SEGLEN;
c = SEGLEN * (i % SEGLEN) + j % SEGLEN;
if (!sud->cells[r][c].det && sud->cells[r][c].pvals[val]) {
if (!(sud->cells[r][c] & DETMASK)
&& sud->cells[r][c] & valmask) {
pr = r;
pc = c;
++np;