From 4879795aa5f5dfb822fc9d7e8997f0e5d82a9ad9 Mon Sep 17 00:00:00 2001 From: Imbus Date: Tue, 5 Dec 2023 13:08:00 +0100 Subject: [PATCH 1/5] Formatting --- app/src/main/java/sudoku/SudokuSolver.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/sudoku/SudokuSolver.java b/app/src/main/java/sudoku/SudokuSolver.java index 8f33998..6e2fe4c 100644 --- a/app/src/main/java/sudoku/SudokuSolver.java +++ b/app/src/main/java/sudoku/SudokuSolver.java @@ -1,14 +1,14 @@ package sudoku; -public interface SudokuSolver{ - +public interface SudokuSolver { + // Work in progress /** - * Set sudoku board, numbers 1-9 are fixed values, 0 is unsolved. + * Set sudoku board, numbers 1-9 are fixed values, 0 is unsolved. */ void setBoard(int[][] board); - + /** * Get the sudoku board */ @@ -16,12 +16,14 @@ public interface SudokuSolver{ /** * Solve soduko + * * @return true if solution could be found */ boolean solve(); /** * Check if digit is legal on the current board + * * @param row * @param col * @param nbr From 808ba05448408bca62dcaaddd34c7507d5f894ce Mon Sep 17 00:00:00 2001 From: Imbus Date: Tue, 5 Dec 2023 13:13:44 +0100 Subject: [PATCH 2/5] Main is in SolverMain.java --- app/src/main/java/sudoku/App.java | 14 -------------- app/src/main/java/sudoku/SolverMain.java | 7 +++++++ 2 files changed, 7 insertions(+), 14 deletions(-) delete mode 100644 app/src/main/java/sudoku/App.java create mode 100644 app/src/main/java/sudoku/SolverMain.java diff --git a/app/src/main/java/sudoku/App.java b/app/src/main/java/sudoku/App.java deleted file mode 100644 index 6aa33d4..0000000 --- a/app/src/main/java/sudoku/App.java +++ /dev/null @@ -1,14 +0,0 @@ -/* - * This Java source file was generated by the Gradle 'init' task. - */ -package sudoku; - -public class App { - public String getGreeting() { - return "Hello World!"; - } - - public static void main(String[] args) { - System.out.println(new App().getGreeting()); - } -} diff --git a/app/src/main/java/sudoku/SolverMain.java b/app/src/main/java/sudoku/SolverMain.java new file mode 100644 index 0000000..76acdf9 --- /dev/null +++ b/app/src/main/java/sudoku/SolverMain.java @@ -0,0 +1,7 @@ +package sudoku; + +public class SolverMain { + public static void main(String[] args) { + System.out.println("Hello world!"); + } +} From d94bc05a4d8f67910dbba363a5e95f768b82c222 Mon Sep 17 00:00:00 2001 From: Imbus Date: Tue, 5 Dec 2023 13:14:02 +0100 Subject: [PATCH 3/5] Redundant comment removal --- app/src/main/java/sudoku/SudokuSolver.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/src/main/java/sudoku/SudokuSolver.java b/app/src/main/java/sudoku/SudokuSolver.java index 6e2fe4c..2500328 100644 --- a/app/src/main/java/sudoku/SudokuSolver.java +++ b/app/src/main/java/sudoku/SudokuSolver.java @@ -1,9 +1,6 @@ package sudoku; public interface SudokuSolver { - - // Work in progress - /** * Set sudoku board, numbers 1-9 are fixed values, 0 is unsolved. */ From da983e438bdc66f63d9ad64d630a0dc8f9bba1ff Mon Sep 17 00:00:00 2001 From: Imbus Date: Tue, 5 Dec 2023 13:14:25 +0100 Subject: [PATCH 4/5] Some example tests --- app/src/test/java/sudoku/AppTest.java | 14 -------------- app/src/test/java/sudoku/SolverTest.java | 12 ++++++++++++ 2 files changed, 12 insertions(+), 14 deletions(-) delete mode 100644 app/src/test/java/sudoku/AppTest.java create mode 100644 app/src/test/java/sudoku/SolverTest.java diff --git a/app/src/test/java/sudoku/AppTest.java b/app/src/test/java/sudoku/AppTest.java deleted file mode 100644 index d687b40..0000000 --- a/app/src/test/java/sudoku/AppTest.java +++ /dev/null @@ -1,14 +0,0 @@ -/* - * This Java source file was generated by the Gradle 'init' task. - */ -package sudoku; - -import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - -class AppTest { - @Test void appHasAGreeting() { - App classUnderTest = new App(); - assertNotNull(classUnderTest.getGreeting(), "app should have a greeting"); - } -} diff --git a/app/src/test/java/sudoku/SolverTest.java b/app/src/test/java/sudoku/SolverTest.java new file mode 100644 index 0000000..ae16b4b --- /dev/null +++ b/app/src/test/java/sudoku/SolverTest.java @@ -0,0 +1,12 @@ +package sudoku; + +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; + +class SolverTest { + @Test void boardTest() { + Solver solver = new Solver(); + solver.solve(); + assertTrue(solver.isSolved()); + } +} From e34b9ab57cdfcca4ab456e793da893275979dc7e Mon Sep 17 00:00:00 2001 From: Imbus Date: Tue, 5 Dec 2023 13:15:09 +0100 Subject: [PATCH 5/5] Solver implementation in Solver.java --- app/src/main/java/sudoku/Solver.java | 32 ++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 app/src/main/java/sudoku/Solver.java diff --git a/app/src/main/java/sudoku/Solver.java b/app/src/main/java/sudoku/Solver.java new file mode 100644 index 0000000..bfc1d7c --- /dev/null +++ b/app/src/main/java/sudoku/Solver.java @@ -0,0 +1,32 @@ +package sudoku; + +public class Solver implements SudokuSolver { + private int[][] board; + + public Solver() { + board = new int[9][9]; + } + + public void setBoard(int[][] board) { + this.board = board; + } + + public int[][] getBoard() { + return board; + } + + public boolean solve() { + } + + public Boolean isSolved() { + } + + private boolean solve(int row, int col) { + } + + public boolean legal(int row, int col, int nbr) { + } + + public String toString() { + } +} \ No newline at end of file