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

fix steps
All checks were successful
Linux arm64 / Build (push) Successful in 43s
Details

Browse Source
This commit is contained in:
Simon Pribylski
2025-02-01 23:00:36 +01:00
parent 78bdefebe5
commit 91c645e34f
5 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/gui/menu/SudokuView.java
View File

@@ -1,5 +1,7 @@
package gui.menu; package gui.menu;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CancellationException; import java.util.concurrent.CancellationException;
import gui.widget.SudokuRenderer; import gui.widget.SudokuRenderer;
@@ -11,6 +13,7 @@ import sudoku.solver.HintHelper;
import sudoku.solver.HumanSolver; import sudoku.solver.HumanSolver;
import sudoku.solver.MixedSolver; import sudoku.solver.MixedSolver;
import sudoku.solver.Solver; import sudoku.solver.Solver;
import sudoku.solver.SolverStep;
import sudoku.solver.HintHelper.Hint; import sudoku.solver.HintHelper.Hint;
import sudoku.structure.MultiDoku; import sudoku.structure.MultiDoku;
@@ -90,8 +93,9 @@ public class SudokuView extends BaseView {
private void startSolve(Solver solver) { private void startSolve(Solver solver) {
resolveThread = new Thread(() -> { resolveThread = new Thread(() -> {
List<SolverStep> steps = new ArrayList<>();
try { try {
unresolved = !solver.solve(this.doku); unresolved = !solver.solve(this.doku, steps);
} catch (CancellationException e) { } catch (CancellationException e) {
System.out.println("The user is bored !"); System.out.println("The user is bored !");
} }

2
app/src/main/java/sudoku/solver/BacktrackingSolver.java
View File

@@ -36,7 +36,7 @@ public class BacktrackingSolver implements Solver {
for (int symbol : possibleSymbols) { for (int symbol : possibleSymbols) {
cellToFill.setSymbolIndex(symbol); cellToFill.setSymbolIndex(symbol);
addStep(cellToFill, steps); addStep(cellToFill, steps);
if (this.solve(doku)) { if (this.solve(doku, steps)) {
return true; return true;
} else { } else {
cellToFill.setSymbolIndex(Cell.NOSYMBOL); cellToFill.setSymbolIndex(Cell.NOSYMBOL);

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

@@ -49,7 +49,7 @@ public class HumanSolver implements Solver {
cellToFill.setSymbolIndex(possibleSymbols.getFirst()); cellToFill.setSymbolIndex(possibleSymbols.getFirst());
addStep(cellToFill, steps); addStep(cellToFill, steps);
return this.solve(doku); return this.solve(doku, steps);
} }
return doku.isSolved(); return doku.isSolved();

4
app/src/main/java/sudoku/solver/MixedSolver.java
View File

@@ -50,7 +50,7 @@ public class MixedSolver implements Solver {
if (possibleSymbols.size() == 1) { if (possibleSymbols.size() == 1) {
cellToFill.setSymbolIndex(possibleSymbols.getFirst()); cellToFill.setSymbolIndex(possibleSymbols.getFirst());
addStep(cellToFill, steps); addStep(cellToFill, steps);
if (this.solve(doku)) { if (this.solve(doku, steps)) {
return true; return true;
} }
} }
@@ -61,7 +61,7 @@ public class MixedSolver implements Solver {
cellToFill.setSymbolIndex(nextSymbol); cellToFill.setSymbolIndex(nextSymbol);
addStep(cellToFill, steps); addStep(cellToFill, steps);
if (this.solve(doku)) { if (this.solve(doku, steps)) {
return true; return true;
} }
cellToFill.setSymbolIndex(Cell.NOSYMBOL); cellToFill.setSymbolIndex(Cell.NOSYMBOL);

2
app/src/main/java/sudoku/solver/RandomSolver.java
View File

@@ -52,7 +52,7 @@ public class RandomSolver implements Solver {
cellToFill.setSymbolIndex(nextSymbol); cellToFill.setSymbolIndex(nextSymbol);
addStep(cellToFill, steps); addStep(cellToFill, steps);
if (this.solve(doku)) { if (this.solve(doku, steps)) {
return true; return true;
} }
cellToFill.setSymbolIndex(Cell.NOSYMBOL); cellToFill.setSymbolIndex(Cell.NOSYMBOL);