joel/privacy-friendly-sudoku-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

QQWing Solver now works for 6x6. Still a lot of work left.

Browse source
This commit is contained in:
Christopher Beckmann 2015-11-22 14:34:07 +01:00
parent 2a652c7e12
commit afc39b78e0
2 changed files with 30 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/tu_darmstadt/sudoku/controller/QQWingController.java
View file

@ -33,6 +33,7 @@ public class QQWingController {
// TODO: GameType options. // TODO: GameType options.
opts.gameDifficulty = difficulty; opts.gameDifficulty = difficulty;
opts.action = Action.GENERATE; opts.action = Action.GENERATE;
opts.threads = Runtime.getRuntime().availableProcessors();
doAction(type); doAction(type);
return generated; return generated;
} }
@ -52,7 +53,12 @@ public class QQWingController {
opts.action = Action.SOLVE; opts.action = Action.SOLVE;
opts.printSolution = true; opts.printSolution = true;
opts.threads = 1;
doAction(gameBoard.getGameType()); doAction(gameBoard.getGameType());
if(solveImpossible) {
// TODO: do something else.
}
return solution; return solution;
} }
@ -206,7 +212,11 @@ public class QQWingController {
private boolean getPuzzleToSolve(int[] puzzle) { private boolean getPuzzleToSolve(int[] puzzle) {
if(level != null) { if(level != null) {
puzzle = level; if(puzzle.length == level.length) {
for(int i = 0; i < level.length; i++) {
puzzle[i] = level[i];
}
}
level = null; level = null;
return true; return true;
} }

25
app/src/main/java/tu_darmstadt/sudoku/controller/qqwing/QQWing.java
View file

@ -147,6 +147,18 @@ public class QQWing {
BOARD_SIZE = (ROW_COL_SEC_SIZE * ROW_COL_SEC_SIZE); // 9 * 9 = 81 // 36 BOARD_SIZE = (ROW_COL_SEC_SIZE * ROW_COL_SEC_SIZE); // 9 * 9 = 81 // 36
POSSIBILITY_SIZE = (BOARD_SIZE * ROW_COL_SEC_SIZE); // 81 * 9 POSSIBILITY_SIZE = (BOARD_SIZE * ROW_COL_SEC_SIZE); // 81 * 9
puzzle = new int[BOARD_SIZE];
solution = new int[BOARD_SIZE];
solutionRound = new int[BOARD_SIZE];
possibilities = new int[POSSIBILITY_SIZE];
randomBoardArray = fillIncrementing(new int[BOARD_SIZE]);
randomPossibilityArray = fillIncrementing(new int[ROW_COL_SEC_SIZE]);
} }
private static int[] fillIncrementing(int[] arr){ private static int[] fillIncrementing(int[] arr){
@ -765,9 +777,9 @@ public class QQWing {
int rowStart = rowToFirstCell(row); int rowStart = rowToFirstCell(row);
boolean inOneBox = true; boolean inOneBox = true;
int rowBox = -1; int rowBox = -1;
for (int i = 0; i < GRID_SIZE_COL; i++) { for (int i = 0; i < GRID_SIZE_ROW; i++) {
for (int j = 0; j < GRID_SIZE_ROW; j++) { for (int j = 0; j < GRID_SIZE_COL; j++) {
int column = i * GRID_SIZE_COL + j; int column = i * GRID_SIZE_ROW + j;
int position = rowColumnToCell(row, column); int position = rowColumnToCell(row, column);
int valPos = getPossibilityIndex(valIndex, position); int valPos = getPossibilityIndex(valIndex, position);
if (possibilities[valPos] == 0) { if (possibilities[valPos] == 0) {
@ -807,14 +819,15 @@ public class QQWing {
return false; return false;
} }
// CHECKED!
private boolean pointingRowReduction(int round) { private boolean pointingRowReduction(int round) {
for (int valIndex = 0; valIndex < ROW_COL_SEC_SIZE; valIndex++) { for (int valIndex = 0; valIndex < ROW_COL_SEC_SIZE; valIndex++) {
for (int section = 0; section < ROW_COL_SEC_SIZE; section++) { for (int section = 0; section < ROW_COL_SEC_SIZE; section++) {
int secStart = sectionToFirstCell(section); int secStart = sectionToFirstCell(section);
boolean inOneRow = true; boolean inOneRow = true;
int boxRow = -1; int boxRow = -1;
for (int j = 0; j < GRID_SIZE_COL; j++) { for (int j = 0; j < GRID_SIZE_ROW; j++) {
for (int i = 0; i < GRID_SIZE_ROW; i++) { for (int i = 0; i < GRID_SIZE_COL; i++) {
int secVal = secStart + i + (ROW_COL_SEC_SIZE * j); int secVal = secStart + i + (ROW_COL_SEC_SIZE * j);
int valPos = getPossibilityIndex(valIndex, secVal); int valPos = getPossibilityIndex(valIndex, secVal);
if (possibilities[valPos] == 0) { if (possibilities[valPos] == 0) {
@ -1509,7 +1522,7 @@ public class QQWing {
*/ */
static int cellToSectionStartCell(int cell) { static int cellToSectionStartCell(int cell) {
return ((cell / SEC_GROUP_SIZE * SEC_GROUP_SIZE) return ((cell / SEC_GROUP_SIZE * SEC_GROUP_SIZE)
+ (cellToColumn(cell) / GRID_SIZE_COL * GRID_SIZE_ROW)); + (cellToColumn(cell) / GRID_SIZE_COL * GRID_SIZE_COL));
} }
/** /**