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

fix: serialize

Browse Source
This commit is contained in:
Simon Pribylski
2025-01-30 00:51:22 +01:00
committed by Melvyn
parent f1d963e546
commit c4becf2d55
11 changed files with 212 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,16 +1,16 @@
package sudoku.solver;
import sudoku.io.SudokuPrinter;
import sudoku.structure.MultiDoku;
import sudoku.structure.Cell;
import sudoku.structure.Sudoku;
import java.util.List;
import java.util.Random;
import java.util.concurrent.CancellationException;
import java.util.logging.Level;
import java.util.logging.Logger;
import sudoku.io.SudokuPrinter;
import sudoku.structure.Cell;
import sudoku.structure.MultiDoku;
import sudoku.structure.Sudoku;
public class Solver {
/**
@@ -46,7 +46,7 @@ public class Solver {
return false;
}
List<Integer> possibleSymbols = doku.getPossibleSymbolsOfCell(cellToFill);
List<Integer> possibleSymbols = cellToFill.getPossibleSymbols();
while (!possibleSymbols.isEmpty()) {
int nextPossibleSymbolIndex = rand.nextInt(possibleSymbols.size());
@@ -78,18 +78,13 @@ public class Solver {
}
Cell cellToFill = doku.getFirstEmptyCell();
if (cellToFill == null) {
System.out.println("AAAAAAAAAAAAAA");
return 0;
}
assert(cellToFill != null);
List<Integer> possibleSymbols = doku.getPossibleSymbolsOfCell(cellToFill);
List<Integer> possibleSymbols = cellToFill.getPossibleSymbols();
for (int symbol : possibleSymbols) {
cellToFill.setSymbolIndex(symbol);
System.out.println("symbol : "+symbol);
System.out.println("doku.isSolved() || Solver.solve(doku) ? "+ (doku.isSolved() || Solver.solve(doku)));
if (doku.isSolved() || Solver.solve(doku)) {
if (Solver.solve(doku) != null) {
result++;
}
cellToFill.setSymbolIndex(Cell.NOSYMBOL);
@@ -103,35 +98,37 @@ public class Solver {
* @param doku MultiDoku, MultiDoku à résoudre.
* @return boolean, valant true si le MultiDoku est résolu, false sinon.
*/
public static boolean solve(MultiDoku doku) {
public static MultiDoku solve(MultiDoku oldDoku) {
if (Thread.interrupted())
throw new CancellationException("User wants to stop the solver");
MultiDoku doku = oldDoku.clone();
if (doku.isSolved()) {
return true;
return doku;
}
Cell cellToFill = doku.getFirstEmptyCell();
if (cellToFill == null) {
return false;
return null;
}
List<Integer> possibleSymbols = doku.getPossibleSymbolsOfCell(cellToFill);
List<Integer> possibleSymbols = cellToFill.getPossibleSymbols();
if (possibleSymbols.isEmpty()) {
return false;
return null;
}
for (int symbol : possibleSymbols) {
cellToFill.setSymbolIndex(symbol);
if (Solver.solve(doku)) {
return true;
if (Solver.solve(doku) != null) {
return doku;
} else {
cellToFill.setSymbolIndex(Cell.NOSYMBOL);
}
}
return false;
return null;
}
/**
@@ -156,7 +153,7 @@ public class Solver {
boolean blocked = true;
for (Cell cellToFill : cellsToFill) {
List<Integer> possibleSymbols = doku.getPossibleSymbolsOfCell(cellToFill);
List<Integer> possibleSymbols = cellToFill.getPossibleSymbols();
if (possibleSymbols.size() != 1) {
continue;
}

5
app/src/main/java/sudoku/solver/StupidSolver.java
View File

@@ -24,9 +24,8 @@ public class StupidSolver {
if (!sudoku.getCell(index).isMutable())
return solve(sudoku, index + 1);
Coordinate coords = sudoku.toCoords(index);
for (int symbol = 0; symbol < sudoku.getSize(); symbol++) {
if (sudoku.tryPlaceCellSymbol(coords.getX(), coords.getY(), symbol)) {
if (sudoku.getCell(index).trySetValue(symbol)) {
// on tente de placer sur la case suivante
if (solve(sudoku, index + 1)) {
return true;
@@ -34,7 +33,7 @@ public class StupidSolver {
}
}
// on a tout essayé et rien n'a fonctionné
sudoku.clearCell(coords.getX(), coords.getY());
sudoku.getCell(index).empty();
return false;
}