From e12955ab4a99d57fe4fed49ea80464b9a8479bdc Mon Sep 17 00:00:00 2001 From: Melvyn Date: Wed, 29 Jan 2025 18:57:00 +0100 Subject: [PATCH] merge --- app/src/main/java/gui/RenderableMultidoku.java | 2 +- app/src/main/java/sudoku/structure/Sudoku.java | 2 +- app/src/main/java/sudoku/structure/SudokuFactory.java | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/gui/RenderableMultidoku.java b/app/src/main/java/gui/RenderableMultidoku.java index 0271a78..db07f0b 100644 --- a/app/src/main/java/gui/RenderableMultidoku.java +++ b/app/src/main/java/gui/RenderableMultidoku.java @@ -28,7 +28,7 @@ public class RenderableMultidoku { } public boolean isResolved() { - return this.doku.isValid(); + return this.doku.isSolved(); } public int getWidth() { diff --git a/app/src/main/java/sudoku/structure/Sudoku.java b/app/src/main/java/sudoku/structure/Sudoku.java index 3b82bd1..2b7560a 100644 --- a/app/src/main/java/sudoku/structure/Sudoku.java +++ b/app/src/main/java/sudoku/structure/Sudoku.java @@ -363,7 +363,7 @@ public class Sudoku { */ private boolean isValid() { for (Cell cell : this.getFilledCells()) { - for (IConstraint constraint : this.constraints) { + for (Constraint constraint : this.constraints) { try { Coordinate coords = this.getCoordinateCell(cell); diff --git a/app/src/main/java/sudoku/structure/SudokuFactory.java b/app/src/main/java/sudoku/structure/SudokuFactory.java index feff0dd..366bdad 100644 --- a/app/src/main/java/sudoku/structure/SudokuFactory.java +++ b/app/src/main/java/sudoku/structure/SudokuFactory.java @@ -9,6 +9,8 @@ import java.util.List; import java.util.Map; import java.util.Random; +import sudoku.io.SudokuSerializer; + import sudoku.constraint.BlockConstraint; import sudoku.constraint.ColumnConstraint; import sudoku.constraint.Constraint;