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

refactor HumanSolver
All checks were successful
Linux arm64 / Build (push) Successful in 39s
Details

Browse Source
This commit is contained in:
Simon Pribylski
2025-02-02 14:36:47 +01:00
parent 413201882b
commit 87727f39e8
1 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app/src/main/java/sudoku/solver/HumanSolver.java
View File

@@ -16,32 +16,25 @@ public class HumanSolver implements Solver {
*/ */
@Override @Override
public boolean solve(MultiDoku doku, List<SolverStep> steps) { public boolean solve(MultiDoku doku, List<SolverStep> steps) {
if (Thread.interrupted()) while (!doku.isSolved()) {
throw new CancellationException("User wants to stop the solver"); boolean filledCell = false;
for (Cell cell : doku.getCells()) {
if (doku.isSolved()) { if (!cell.isMutable() || !cell.isEmpty())
return true; continue;
}
List<Integer> possibleSymbols = cell.getPossibleSymbols();
List<Cell> cellsToFill = doku.getEmptyCells(); if (possibleSymbols.size() == 1) {
if (cellsToFill.isEmpty()) { cell.setSymbolIndex(possibleSymbols.getFirst());
return false; addStep(cell, steps);
} filledCell = true;
}
for (Cell cellToFill : cellsToFill) {
List<Integer> possibleSymbols = cellToFill.getPossibleSymbols();
if (possibleSymbols.size() != 1) {
continue;
} }
// on ne peut plus remplir de cases, on abandonne
cellToFill.setSymbolIndex(possibleSymbols.getFirst()); if (!filledCell)
addStep(cellToFill, steps); return false;
return this.solve(doku, steps);
} }
return doku.isSolved(); return true;
} }
} }