daviddoji/pytudes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding code fixes for solution validation and an enhancement to identify the puzzle number

Browse Source
This commit is contained in:
Visali Alagappan 2025-11-23 16:45:48 +05:30
parent 77b8f73025
commit e4e3083a6a
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
py/Sudoku.java
View File

@ -116,12 +116,14 @@ public class Sudoku {
for (int i = 0; i < repeat; ++i) { for (int i = 0; i < repeat; ++i) {
long startTime = printPuzzleStats ? System.nanoTime() : 0; long startTime = printPuzzleStats ? System.nanoTime() : 0;
int[] solution = initialize(grid); // All the real work is int[] solution = initialize(grid); // All the real work is
if (runSearch) search(solution, gridpool, 0); // on these 2 lines. if (runSearch) solution = search(solution, gridpool, 0); // on these 2 lines.
int threadId = Thread.currentThread().getName().contains("-") ?
Integer.parseInt(Thread.currentThread().getName().split("-")[1]) : 0;
if (printPuzzleStats) { if (printPuzzleStats) {
printStats(1, startTime, "Puzzle " + (g + 1)); printStats(1, startTime, "Puzzle " + ((g + 1) + (threadId * splitSize)));
} }
if (i == 0 && (printGrid || (verifySolution && !isSolution(solution, puzzle)))) { if (i == 0 && (printGrid || (verifySolution && !isSolution(solution, puzzle)))) {
printGrids("Puzzle " + (g + 1), grid, solution); printGrids("Puzzle " + ((g + 1) + (threadId * splitSize)) , grid, solution);
} }
} }
} }
@ -134,12 +136,14 @@ public class Sudoku {
final long startTime = System.nanoTime(); final long startTime = System.nanoTime();
int nGrids = grids.size(); int nGrids = grids.size();
final CountDownLatch latch = new CountDownLatch(nThreads); final CountDownLatch latch = new CountDownLatch(nThreads);
int size = nGrids / nThreads; splitSize = nGrids / nThreads;
for (int c = 0; c < nThreads; ++c) { for (int c = 0; c < nThreads; ++c) {
final List<int[]> sublist = grids.subList(c * size, final List<int[]> sublist = grids.subList(c * splitSize,
c == nThreads - 1 ? nGrids : (c + 1) * size); c == nThreads - 1 ? nGrids : (c + 1) * splitSize);
final String name = "Thread-" + c;
new Thread() { new Thread() {
public void run() { public void run() {
setName(name);
solveList(sublist); solveList(sublist);
latch.countDown(); latch.countDown();
if (printThreadStats) { if (printThreadStats) {
@ -198,6 +202,7 @@ public class Sudoku {
final int[][] PEERS = new int[N * N][20]; final int[][] PEERS = new int[N * N][20];
final int[] NUM_DIGITS = new int[ALL_DIGITS + 1]; final int[] NUM_DIGITS = new int[ALL_DIGITS + 1];
final int[] HIGHEST_DIGIT = new int[ALL_DIGITS + 1]; final int[] HIGHEST_DIGIT = new int[ALL_DIGITS + 1];
int splitSize = 0;
{ {
// Initialize ALL_UNITS to be an array of the 27 units: rows, columns, and blocks // Initialize ALL_UNITS to be an array of the 27 units: rows, columns, and blocks
@ -274,7 +279,7 @@ public class Sudoku {
} }
// Check that each unit is a permutation of digits // Check that each unit is a permutation of digits
for (int[] u: ALL_UNITS) { for (int[] u: ALL_UNITS) {
if (IntStream.of(u).sum() != ALL_DIGITS) return false; if (Arrays.stream(u).map(sq -> grid[sq]).sum() != ALL_DIGITS) return false;
} }
return true; return true;
} }