Ryuk/Sudoku
3
1
Fork 0
Code Issues 8 Pull Requests Actions Projects Releases 1 Wiki Activity

fix solver log display
All checks were successful
Linux arm64 / Build (push) Successful in 24m1s
Details

Browse Source
This commit is contained in:
Simon Pribylski
2025-01-28 10:08:26 +01:00
parent ebb3a4c48a
commit a1fd715aee
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/sudoku/solver/Solver.java
View File

@@ -16,7 +16,8 @@ public class Solver {
/** /**
* Résout le multidoku passé en paramètre si c'est possible. * Résout le multidoku passé en paramètre si c'est possible.
* En testant toutes les possibilités, de manière aléatoire, avec un algorithme de backtracking. * En testant toutes les possibilités, de manière aléatoire, avec un algorithme
* de backtracking.
* *
* @param doku Multidoku, à résoudre * @param doku Multidoku, à résoudre
* @param rand Random, pour tester aléatoirement les symboles * @param rand Random, pour tester aléatoirement les symboles
@@ -24,10 +25,13 @@ public class Solver {
*/ */
public static boolean solveRandom(MultiDoku doku, Random rand) { public static boolean solveRandom(MultiDoku doku, Random rand) {
if (Thread.interrupted()) if (Thread.interrupted())
throw new CancellationException("User wants to stop the solver"); throw new CancellationException("User wants to stop the solver");
Sudoku sudoku = doku.getSubGrid(0); Sudoku sudoku = doku.getSubGrid(0);
logger.log(Level.INFO, '\n'+SudokuPrinter.toStringRectangleSudoku(sudoku, sudoku.getSize(), sudoku.getSize())); logger.log(Level.INFO,
'\n' + SudokuPrinter.toStringRectangleSudoku(sudoku,
sudoku.getBlockWidth() == 0 ? sudoku.getSize() : sudoku.getBlockWidth(),
sudoku.getBlockWidth() == 0 ? sudoku.getSize() : sudoku.getSize() / sudoku.getBlockWidth()));
if (doku.isValid()) { if (doku.isValid()) {
return true; return true;
@@ -83,7 +87,7 @@ public class Solver {
public static boolean solve(MultiDoku doku) { public static boolean solve(MultiDoku doku) {
if (Thread.interrupted()) if (Thread.interrupted())
throw new CancellationException("User wants to stop the solver"); throw new CancellationException("User wants to stop the solver");
if (doku.isValid()) { if (doku.isValid()) {
return true; return true;
@@ -99,7 +103,7 @@ public class Solver {
return false; return false;
} }
for (int symbol : possibleSymbols){ for (int symbol : possibleSymbols) {
cellToFill.setSymbolIndex(symbol); cellToFill.setSymbolIndex(symbol);
if (Solver.solve(doku)) { if (Solver.solve(doku)) {