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

fix mixedsolver

Browse Source
This commit is contained in:
Simon Pribylski
2025-02-02 22:56:14 +01:00
parent 71666a3883
commit edfc5733db
1 changed files with 48 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,6 @@
package sudoku.solver; package sudoku.solver;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.CancellationException; import java.util.concurrent.CancellationException;
@@ -8,18 +9,23 @@ import sudoku.structure.MultiDoku;
public class MixedSolver implements Solver { public class MixedSolver implements Solver {
private Cell findCellToBacktrack(MultiDoku doku, int maxPossibilities) { private List<Cell> findCellsToBacktrack(MultiDoku doku, int maxPossibilities) {
List<Cell> cells = new ArrayList<>();
for (Cell cell : doku.getCells()) { for (Cell cell : doku.getCells()) {
if (!cell.isMutable() || !cell.isEmpty()) if (!cell.isMutable() || !cell.isEmpty())
continue; continue;
List<Integer> possibleSymbols = cell.getPossibleSymbols(); List<Integer> possibleSymbols = cell.getPossibleSymbols();
if (possibleSymbols.size() == maxPossibilities) { if (possibleSymbols.size() == maxPossibilities) {
return cell; cells.add(cell);
}
} }
// une cellule nous empêche de continuer
if (possibleSymbols.size() == 0)
return null; return null;
} }
return cells;
}
/** /**
* Résout le MultiDoku passé en paramètre, avec règles de déduction et * Résout le MultiDoku passé en paramètre, avec règles de déduction et
@@ -34,8 +40,12 @@ public class MixedSolver implements Solver {
throw new CancellationException("User wants to stop the solver"); throw new CancellationException("User wants to stop the solver");
} }
while (!doku.isSolved()) { if (doku.isSolved())
boolean filledCell = false; return true;
if (findCellsToBacktrack(doku, 0) == null)
return false;
for (Cell cell : doku.getCells()) { for (Cell cell : doku.getCells()) {
if (!cell.isMutable() || !cell.isEmpty()) if (!cell.isMutable() || !cell.isEmpty())
continue; continue;
@@ -44,31 +54,37 @@ public class MixedSolver implements Solver {
if (possibleSymbols.size() == 1) { if (possibleSymbols.size() == 1) {
cell.setSymbolIndex(possibleSymbols.getFirst()); cell.setSymbolIndex(possibleSymbols.getFirst());
addStep(cell, steps); addStep(cell, steps);
filledCell = true; if (solve(doku, steps))
return true;
cell.setSymbolIndex(Cell.NOSYMBOL);
addStep(cell, steps);
return false;
} }
} }
// on ne peut plus remplir de cases, on tente de backtrack // on ne peut plus remplir de cases, on tente de backtrack
if (!filledCell) {
int maxPossibilities = 2; int maxPossibilities = 2;
Cell backtrackCell = null; List<Cell> backtrackCells = new ArrayList<>();
while (backtrackCell == null) { while (backtrackCells.isEmpty()) {
backtrackCell = findCellToBacktrack(doku, maxPossibilities); backtrackCells = findCellsToBacktrack(doku, maxPossibilities);
if (backtrackCells == null || maxPossibilities > doku.getSubGrid(0).getSize())
return false;
maxPossibilities++; maxPossibilities++;
} }
// on fait du backtracking // on fait du backtracking
for (Cell backtrackCell : backtrackCells) {
List<Integer> possibilities = backtrackCell.getPossibleSymbols(); List<Integer> possibilities = backtrackCell.getPossibleSymbols();
for (int symbol : possibilities) { for (int symbol : possibilities) {
doku.getStateManager().pushState();
backtrackCell.setSymbolIndex(symbol); backtrackCell.setSymbolIndex(symbol);
addStep(backtrackCell, steps);
if (solve(doku, steps)) if (solve(doku, steps))
return true; return true;
doku.getStateManager().popState();
} }
}
backtrackCell.setSymbolIndex(Cell.NOSYMBOL);
} addStep(backtrackCell, steps);
}
return true;
return false;
} }
} }