Changeset 435 in Java_Quellcode_SOOP_Vorlesung

Timestamp:

Feb 14, 2020, 3:09:50 PM (5 years ago)

Author:

tr

Message:

Sudoku: Kleinigkeiten

Files:

• arrays/SudokuSolver.java (modified) (1 diff)
• arrays/sudokuextra/SudokuSolverLogic.java (modified) (1 diff)
• rekursion/SudokuSolverRekursiv.java (modified) (1 diff)

arrays/SudokuSolver.java

@@ -206 +206 @@
         };
 
+        int[][] sError = {
+            {-4, -7, 0, 3, 0, -2, 0, -6, 0},
+            {0, 0, -9, 0, 0, 0, -2, 0, 0},
+            {0, -8, 0, 0, 0, 0, -7, 0, 0},
+            {0, -5, 0, 0, -1, -9, 0, 0, 0},
+            {0, 0, 0, -6, 0, -5, 0, 0, 0},
+            {0, 0, 0, -2, -8, 0, 0, -5, 0},
+            {0, 0, -3, 0, 0, 0, 0, -9, 0},
+            {0, 0, -2, 0, 0, 0, -8, 0, 0},
+            {0, -4, 0, -8, 0, -6, 0, -7, -2},
+        };
+/*
+[4, 7, 1, 3, 2, 2, 5, 6, 9]
+[3, 6, 9, 4, 5, 7, 2, 1, 8]
+[2, 8, 5, 9, 6, 1, 7, 4, 3]
+[6, 5, 8, 7, 1, 9, 3, 2, 4]
+[1, 2, 4, 6, 3, 5, 9, 8, 7]
+[9, 3, 7, 2, 8, 4, 6, 5, 1]
+[8, 1, 3, 5, 7, 6, 4, 9, 2]
+[5, 9, 2, 1, 4, 3, 8, 7, 6]
+[7, 4, 6, 8, 9, 6, 1, 7, 2]
+ */
+        
         int[][] sudoku;
         sudoku = sudokuSchnell;
         sudoku = sudokuLangsam;
+        sudoku = sError;
         // sudoku = sudokuLeer;
 

arrays/sudokuextra/SudokuSolverLogic.java

@@ -160 +160 @@
     public static void main(String[] args) {
         
-        int[][] sudoku = parseSudokuString(SudokuPuzzles.sExtreme2);
+        String puzzle = SudokuPuzzles.sLangsam;
+        int[][] sLogic = parseSudokuString(puzzle);
+        int[][] sBrute = parseSudokuString(puzzle);
         
-        printSudoku(sudoku);
+        printSudoku(sLogic);
         
-        solve(sudoku);
+        long start = System.currentTimeMillis();
+        solve(sLogic);
+        printSudoku(sLogic);
+        SudokuSolverBF.solve(sLogic);
+        System.out.println("time logic: " + (System.currentTimeMillis() - start));
+        
+        printSudoku(sLogic);
+        
+        start = System.currentTimeMillis();
+        SudokuSolverBF.solve(sBrute);
+        System.out.println("time brute: " + (System.currentTimeMillis() - start));
 
-        printSudoku(sudoku);
+        printSudoku(sBrute);
 
-        SudokuSolverBF.solve(sudoku);
-        
-        printSudoku(sudoku);
     }
 }

rekursion/SudokuSolverRekursiv.java

@@ -102 +102 @@
         // Durch den rekursiven Aufruf dieser Methode kehrt return einen Schritt
         // nach oben zurück. Dort war die Position noch um 1 kleiner, es wird
-        // also nach vorn gegeangen.
+        // also nach vorn gegangen.
         a[zeile][spalte] = 0;
         return false;