From 2b3581a400e113f01e00f9ecccd937cb276dd9b6 Mon Sep 17 00:00:00 2001 From: Janet-Doe Date: Sat, 1 Feb 2025 14:56:26 +0100 Subject: [PATCH] fix --- app/src/main/java/sudoku/solver/HumanSolver.java | 4 +++- app/src/main/java/sudoku/solver/MixedSolver.java | 4 +++- app/src/main/java/sudoku/solver/RandomSolver.java | 5 +++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/sudoku/solver/HumanSolver.java b/app/src/main/java/sudoku/solver/HumanSolver.java index 589d932..e649378 100644 --- a/app/src/main/java/sudoku/solver/HumanSolver.java +++ b/app/src/main/java/sudoku/solver/HumanSolver.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.concurrent.CancellationException; import java.util.logging.Level; +import gui.Symbols; import sudoku.io.SudokuPrinter; import sudoku.structure.Cell; import sudoku.structure.MultiDoku; @@ -26,7 +27,8 @@ public class HumanSolver implements Solver { logger.log(Level.FINE, '\n' + SudokuPrinter.toStringRectangleSudoku(sudoku, sudoku.getBlockWidth() == 0 ? sudoku.getSize() : sudoku.getBlockWidth(), - sudoku.getBlockWidth() == 0 ? sudoku.getSize() : sudoku.getSize() / sudoku.getBlockWidth())); + sudoku.getBlockWidth() == 0 ? sudoku.getSize() : sudoku.getSize() / sudoku.getBlockWidth(), + Symbols.Numbers)); if (doku.isSolved()) { return true; diff --git a/app/src/main/java/sudoku/solver/MixedSolver.java b/app/src/main/java/sudoku/solver/MixedSolver.java index 87351d7..0ec3e2f 100644 --- a/app/src/main/java/sudoku/solver/MixedSolver.java +++ b/app/src/main/java/sudoku/solver/MixedSolver.java @@ -5,6 +5,7 @@ import java.util.Random; import java.util.concurrent.CancellationException; import java.util.logging.Level; +import gui.Symbols; import sudoku.io.SudokuPrinter; import sudoku.structure.Cell; import sudoku.structure.MultiDoku; @@ -32,7 +33,8 @@ public class MixedSolver implements Solver{ '\n' + SudokuPrinter.toStringRectangleSudoku( sudoku, sudoku.getBlockWidth() == 0 ? sudoku.getSize() : sudoku.getBlockWidth(), - sudoku.getBlockWidth() == 0 ? sudoku.getSize() : sudoku.getSize() / sudoku.getBlockWidth())); + sudoku.getBlockWidth() == 0 ? sudoku.getSize() : sudoku.getSize() / sudoku.getBlockWidth(), + Symbols.Numbers)); if (doku.isSolved()) { return true; diff --git a/app/src/main/java/sudoku/solver/RandomSolver.java b/app/src/main/java/sudoku/solver/RandomSolver.java index 275d928..a90d7dd 100644 --- a/app/src/main/java/sudoku/solver/RandomSolver.java +++ b/app/src/main/java/sudoku/solver/RandomSolver.java @@ -5,6 +5,7 @@ import java.util.Random; import java.util.concurrent.CancellationException; import java.util.logging.Level; +import gui.Symbols; import sudoku.io.SudokuPrinter; import sudoku.structure.Cell; import sudoku.structure.MultiDoku; @@ -18,7 +19,6 @@ public class RandomSolver implements Solver { * de backtracking. * * @param doku Multidoku, à résoudre - * @param rand Random, pour tester aléatoirement les symboles * @return boolean, true s'il est résolu ou false s'il ne l'est pas. */ @Override @@ -32,7 +32,8 @@ public class RandomSolver implements Solver { logger.log(Level.FINE, '\n' + SudokuPrinter.toStringRectangleSudoku(sudoku, sudoku.getBlockWidth() == 0 ? sudoku.getSize() : sudoku.getBlockWidth(), - sudoku.getBlockWidth() == 0 ? sudoku.getSize() : sudoku.getSize() / sudoku.getBlockWidth())); + sudoku.getBlockWidth() == 0 ? sudoku.getSize() : sudoku.getSize() / sudoku.getBlockWidth(), + Symbols.Numbers)); if (doku.isSolved()) { return true;