From c42d061cfe389f8ee0ead8fc24bb67e071e5f8e8 Mon Sep 17 00:00:00 2001
From: xxMrPHDxx <pian.minecraft1@gmail.com>
Date: Wed, 22 Feb 2017 07:03:16 +0800
Subject: [PATCH] Code Updated!!!

---
 src/grid/Cell.java   |  63 +++------
 src/grid/Grid.java   | 309 ++++++++++---------------------------------
 src/grid/Sudoku.java |  31 +++++
 src/main/Game.java   |  24 +---
 4 files changed, 127 insertions(+), 300 deletions(-)
 create mode 100644 src/grid/Sudoku.java

diff --git a/src/grid/Cell.java b/src/grid/Cell.java
index 5b45408..dfd0216 100644
--- a/src/grid/Cell.java
+++ b/src/grid/Cell.java
@@ -6,74 +6,45 @@
 
 public class Cell {
 
-	private String c;
-	private int x,y;
-	
-	private int row,col;
+	public int value = 0;
 	
-	private int p=2;
-	private int p2=4;
-	private int size=40;
+	private int x,y;
 	
-	private boolean selected = false;
+	private final int p=2,p2=p * 2,size=40;
 	
-	private boolean original = false;
+	boolean selected = false;
+	boolean original = false;
 	
 	public Cell(int i,int j){
-		this.c = " ";
-		this.row = i;
-		this.col = j;
 		this.x = p * (j - (int)(j/3)) + p2 * ((int)(j/3) + 1) + j * size;
 		this.y = p * (i - (int)(i/3)) + p2 * ((int)(i/3) + 1) + i * size;
 	}
 	
-	public void original(){
-		this.original = true;
-	}
-	
-	public boolean isOriginal(){
-		return original;
-	}
-	
 	public boolean contains(int x,int y){
 		return (x > this.x && x < this.x + size && y > this.y && y < this.y + size);
 	}
 	
-	public int getRow(){
-		return row;
-	}
-	public int getCol(){
-		return col;
-	}
-	
-	public String getRowCol(){
-		return ("row " + (row+1) + ", col "+(col+1));
-	}
-	
-	public void setValue(String c){
-		this.c = c;
-	}
-	
-	public String getValue(){
-		return c;
-	}
-	
-	public void select(){
-		selected = true;
+	public void setValue(int value){
+		this.value = value;
+		original = true;
 	}
 	
-	public boolean isSelected(){
-		return selected;
+	public void clear(){
+		this.value = 0;
+		original = false;
 	}
 	
 	public void draw(Graphics g){
 		g.fillRect(x, y, size, size);
 		g.setColor(Color.BLACK);
-		if(!original)
+		if(!original){
 			g.setFont(new Font("Century Gothic",Font.PLAIN, 30));
-		else
+		}else{
 			g.setFont(new Font("Century Gothic",Font.BOLD, 30));
-		g.drawString(c, x + size - 30, y + size - 10);
+			g.setColor(Color.BLUE);
+		}
+		if(value == 0)return;
+		g.drawString(String.valueOf(value), x + size - 30, y + size - 10);
 	}
 	
 }
diff --git a/src/grid/Grid.java b/src/grid/Grid.java
index bf12db9..cfc3d5d 100644
--- a/src/grid/Grid.java
+++ b/src/grid/Grid.java
@@ -4,157 +4,56 @@
 import java.awt.Graphics;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
-import java.util.ArrayList;
 
 public class Grid {
 	
-	String[] values = new String[]{"1","2","3","4","5","6","7","8","9"};
-	
-	String[][] Example = new String[][]{
-			{"5","3"," "," ","7"," "," "," "," "},
-			{"6"," "," ","1","9","5"," "," "," "},
-			{" ","9","8"," "," "," "," ","6"," "},
-			{"8"," "," "," ","6"," "," "," ","3"},
-			{"4"," "," ","8"," ","3"," "," ","1"},
-			{"7"," "," "," ","2"," "," "," ","6"},
-			{" ","6"," "," "," "," ","2","8"," "},
-			{" "," "," ","4","1","9"," "," ","5"},
-			{" "," "," "," ","8"," "," ","7","9"}};
-	
-	public Cell[][] cells;
+	public final int rows = 9,cols = 9;
+	public Cell[][] grid = new Cell[rows][cols];
 	
 	public Cell selectedCell;
 	private int selectedRow = -1;
 	private int selectedCol = -1;
 	
-	public boolean solved = false;
+	public boolean done = false;
 	
 	public Grid(){
-		cells = new Cell[9][9];
-//		for(int i=0;i<cells.length;i++){
-//			for(int j=0;j<cells[0].length;j++){
-//				cells[i][j] = new Cell(i,j);
-//			}
-//		}
-		
-//		for(int i=0;i<9;i++){
-//			for(int j=0;j<9;j++){
-//				cells[i][j].setValue("4");
-//			}
-//		}
-		
-		for(int i=0;i<cells.length;i++){
-			for(int j=0;j<cells[0].length;j++){
-				cells[i][j] = new Cell(i,j);
-				
+		for(int row=0;row<rows;row++){
+			for(int col=0;col<cols;col++){
+				grid[row][col] = new Cell(row,col);
 			}
 		}
-		
-		for(int i=0;i<cells.length;i++){
-			for(int j=0;j<cells[0].length;j++){
-				if(Example[i][j] != " ")cells[i][j].original();
-				cells[i][j].setValue(Example[i][j]);
-			}
-		}
-		
-//		selectedCell = cells[4][4];
 	}
 	
 	public void checkGrid(){
-		//Make original copy of grid
-//		Cell copy[][] = cells;//new Cell[9][9];
-//		for(int i=0;i<cells.length;i++){
-//			for(int j=0;j<cells[0].length;j++){
-//				copy[i][j] = new Cell(i,j);
-//				copy[i][j].setValue(cells[i][j].getValue());
-//			}
-//		}
 		
-		//Get subgrid 3x3
-		Cell[][][][] subgrid = new Cell[3][3][3][3];
-		for(int i=0;i<cells.length;i++){
-			for(int j=0;j<cells[0].length;j++){
-				subgrid[i/3][j/3][i%3][j%3] = cells[i][j];
-			}
-		}
-		
-		for(int row=0;row<cells.length;row++){
-			for(int col=0;col<cells[0].length;col++){
-				for(int i=0;i<values.length;i++){
-					if(cells[row][col].getValue() == " ")continue;
-					if(hasRow(row,values[i]) || hasCol(col,values[i]) || hasSubgrid(subgrid[row/3][col/3],values[i])){
-						
-					}
-				}
-			}
-		}
-
-		int lastnx,lastny;
-		for(int nx=0;nx<cells.length;nx++){
-			for(int ny=0;ny<cells[0].length;ny++){
-				if(cells[nx][ny].getValue() == " "){									//Check grid empty
-					lastnx=nx;lastny=ny;
-					for(int i=0;i<9;i++){
-						String value = values[i];
-						if(!(hasRow(nx,value) || hasCol(ny,value) || hasSubgrid(subgrid[nx/3][ny/3],value))){
-							System.out.println("SAME Value of " + value + " At ROW " + (nx + 1) + ", COL " + (ny + 1));
-							cells[nx][ny].setValue(value);
-						}else if(hasRow(nx,value)||hasCol(ny,value)||hasSubgrid(subgrid[nx/3][ny/3],value)){
-							nx=lastnx;
-							ny=lastny;
-						}
-					}
-				}
-			}
-		}
-	}
-	
-	private boolean hasRow(int row,String value){
-		for(int i=0;i<cells[0].length;i++){
-			if(cells[row][i].getValue() == value)return true;
-		}
-		return false;
-	}
-	
-	private boolean hasCol(int col,String value){
-		for(int i=0;i<cells.length;i++){
-			if(cells[i][col].getValue() == value)return true;
-		}
-		return false;
 	}
 	
-	private boolean hasSubgrid(Cell[][] subgrid,String value){
-		for(int i=0;i<subgrid.length;i++){
-			for(int j=0;j<subgrid[0].length;j++){
-				if(subgrid[i][j].getValue() == value)return true;
+	private boolean validateRow(int r,int c){
+		for(int col=0;col<cols;col++){
+			if(c != col && grid[r][c].value == grid[r][col].value){
+				return false;
 			}
 		}
-		return false;
-	}
-	
-	public boolean validateRow(Cell c){
-		for(int i=0;i<cells[0].length;i++){
-			if(c.getValue() == " ")continue;
-			if(c.getCol() != i && cells[c.getCol()][i].getValue() == c.getValue())return false;
-		}
 		return true;
 	}
 	
-	public boolean validateCol(Cell c){
-		for(int i=0;i<cells.length;i++){
-			if(c.getValue() == " ")continue;
-			if(c.getRow() != i && cells[i][c.getCol()].getValue() == c.getValue())return false;
+	private boolean validateCol(int r,int c){
+		for(int row=0;row<rows;row++){
+			if(r != row && grid[r][c].value == grid[row][c].value){
+				return false;
+			}
 		}
 		return true;
 	}
 	
-	public boolean validateBox(Cell c){
-		int box_r = c.getRow() / 3;
-	    int box_c = c.getCol() / 3;
+	private boolean validateBox(int r,int c){
+		int value = grid[r][c].value;
+	    int box_r = (int)Math.floor(r / 3);
+	    int box_c = (int)Math.floor(c / 3);
 
 	    for (int _r = box_r * 3; _r < box_r * 3 + 3; _r++) {
 	        for (int _c = box_c * 3; _c < box_c * 3 + 3; _c++) {
-	            if (_r != c.getRow() && _c != c.getCol() && cells[_r][_c].getValue() == c.getValue()) {
+	            if (_r != r && _c != c && grid[_r][_c].value == value) {
 	                return false;
 	            }
 	        }
@@ -162,13 +61,11 @@ public boolean validateBox(Cell c){
 	    return true;
 	}
 	
-	public boolean checkCell(Cell c){
-		return(validateRow(c) || validateCol(c) || validateBox(c));
+	public boolean okay(int r,int c){
+		return (validateRow(r,c) && validateCol(r,c) && validateBox(r,c));
 	}
 	
 	public boolean backtrack(int r,int c){
-		
-		
 		c++; // Move to next cell in row
 	    if (c > 8) { // Moves to next row when end of column is reached
 	        c = 0;
@@ -178,159 +75,99 @@ public boolean backtrack(int r,int c){
 	        }
 	    }
 	    
-	    int value=0;
-	    if (cells[r][c].getValue() != " ") { // Move to next cell if user has entered a number in current cell
-	        if (!(validateRow(cells[r][c]) && validateCol(cells[r][c]) && validateBox(cells[r][c]))){
+		if (grid[r][c].value != 0) { // Move to next cell if user has entered a number in current cell
+	        if (!okay(r,c)){
 	            return false;
-	        }else{
-	        	if(cells[r][c].isOriginal())
-	        		if(value >= 0 && value <= 9)cells[r][c].setValue(values[value]);
-            }
-	        return this.backtrack(r, c);
+	        }
+	        return backtrack(r, c);
 	    } else { // Goes through all possible numbers if user has left cell blank
-	        for (int x = 0; x < 9; x++) {
-	            cells[r][c].setValue(values[x]);
-	            if (validateRow(cells[r][c]) && validateCol(cells[r][c]) && validateBox(cells[r][c])){
+	        for (int x = 1; x < 10; x++) {
+	            grid[r][c].value = x;
+	            if (okay(r,c)){
 	                if (backtrack(r, c)) {
 	                    return true;
 	                }
 	            }
 	        }
+	        grid[r][c].value = 0;
 	        return false;
 	    }
 	}
 	
-	public boolean solved(){
-		for(int i=0;i<cells.length;i++){
-			for(int j=0;j<cells[0].length;j++){
-				if (cells[i][j].getValue() != " " && !(validateRow(cells[i][j]) && validateCol(cells[i][j]) && validateBox(cells[i][j]))){
-	    			return false;
-				}
-			}
-		}
-		
-		return true;//this.backtrack(0, -1);
-	}
-	
-	public void solve(){
-		int current=0;
-		while(!solved()){
-			if(!backtrack(current/9,current%9)){
-				current++;
-			}else{
-				current--;
-			}
-		}
-		
-	}
-
-	public boolean isEmpty(int r,int c){
-		if(cells[r][c].getValue() == " ")return true;
-		return false;
-	}
-	
-	public boolean checkCells(){
-		for(int i=0;i<cells.length;i++){
-			for(int j=0;j<cells[0].length;j++){
-				if(checkCell(cells[i][j]))return true;
-			}
-		}
-		return false;
-	}
-	
 	public void update(){
 		if(selectedCell != null){
-			if(selectedRow < 0)selectedRow = cells.length - 1;
-			if(selectedRow > cells.length - 1)selectedRow = 0;
-			if(selectedCol > cells[0].length - 1)selectedCol = 0;
-			if(selectedCol < 0)selectedCol = cells[0].length - 1;
-			selectedCell = cells[selectedRow][selectedCol];
+			if(selectedRow < 0)selectedRow = rows - 1;
+			if(selectedRow > rows - 1)selectedRow = 0;
+			if(selectedCol > cols - 1)selectedCol = 0;
+			if(selectedCol < 0)selectedCol = cols - 1;
+			selectedCell = grid[selectedRow][selectedCol];
 		}
 	}
 	
 	public void draw(Graphics g){
-		//Draw cells 9x9
-		for(int i=0;i<cells.length;i++){
-			for(int j=0;j<cells[0].length;j++){
-				if(cells[i][j] == selectedCell){
+		for(int row=0;row<rows;row++){
+			for(int col=0;col<cols;col++){
+				if(grid[row][col] == selectedCell){
 					g.setColor(Color.GRAY);
 				}else{
 					g.setColor(Color.WHITE);
 				}
-				cells[i][j].draw(g);
+				grid[row][col].draw(g);
 			}
 		}
 	}
 	
-	public void keyPressed(int k){
-		if(selectedCell == null)return;
-		if(!selectedCell.isOriginal()){
-			if(k == KeyEvent.VK_SPACE){
-				selectedCell.setValue(" ");
-			}
-			if(k == KeyEvent.VK_1){
-				selectedCell.setValue("1");
-			}
-			if(k == KeyEvent.VK_2){
-				selectedCell.setValue("2");
-			}
-			if(k == KeyEvent.VK_3){
-				selectedCell.setValue("3");
-			}
-			if(k == KeyEvent.VK_4){
-				selectedCell.setValue("4");
-			}
-			if(k == KeyEvent.VK_5){
-				selectedCell.setValue("5");
-			}
-			if(k == KeyEvent.VK_6){
-				selectedCell.setValue("6");
-			}
-			if(k == KeyEvent.VK_7){
-				selectedCell.setValue("7");
-			}
-			if(k == KeyEvent.VK_8){
-				selectedCell.setValue("8");
+	public void keyPressed(KeyEvent e){
+		if(e.getKeyCode() == KeyEvent.VK_S){ //Solve grid
+			done = true;
+			backtrack(0,-1);
+		}
+		if(e.getKeyCode() == KeyEvent.VK_C){ //Clear grid
+			for(int row=0;row<rows;row++){
+				for(int col=0;col<cols;col++){
+					grid[row][col].clear();
+				}
 			}
-			if(k == KeyEvent.VK_9){
-				selectedCell.setValue("9");
+		}
+		if(e.getKeyCode() == KeyEvent.VK_D){ //Toggle done 
+			done = true;
+		}
+		if(selectedCell == null)return;
+		if(!done){
+			for(int i=0;i<=9;i++){
+				if(e.getKeyCode() == i+48){
+					selectedCell.setValue(i);
+				}
 			}
 		}
-		if(k == KeyEvent.VK_UP){
+		if(e.getKeyCode() == KeyEvent.VK_UP){
 			selectedRow--;
 		}
-		if(k == KeyEvent.VK_DOWN){
+		if(e.getKeyCode() == KeyEvent.VK_DOWN){
 			selectedRow++;
 		}
-		if(k == KeyEvent.VK_LEFT){
+		if(e.getKeyCode() == KeyEvent.VK_LEFT){
 			selectedCol--;
 		}
-		if(k == KeyEvent.VK_RIGHT){
+		if(e.getKeyCode() == KeyEvent.VK_RIGHT){
 			selectedCol++;
 		}
-		if(k == KeyEvent.VK_Z){
-			selectedCell = null;
-			selectedRow = -1;
-			selectedCol = -1;
-		}
 	}
 	
 	public void mousePressed(MouseEvent e){
-		for(int i=0;i<cells.length;i++){
-			for(int j=0;j<cells[0].length;j++){
-				if(cells[i][j].contains(e.getX(), e.getY())){
-					selectedCell = cells[i][j];
-					selectedRow = i;
-					selectedCol = j;
+		for(int row=0;row<rows;row++){
+			for(int col=0;col<cols;col++){
+				if(grid[row][col].contains(e.getX(), e.getY())){
+					if(grid[row][col] != selectedCell){
+						selectedCell = grid[row][col];
+						selectedRow = row;
+						selectedCol = col;
+					}else{
+						selectedCell = null;
+					}
 				}
 			}
 		}
 	}
 	
-	/*
-	 * g.fillRect(p * (j - (int)(j/3)) + p2 * ((int)(j/3) + 1) + j * size,
-						   p * (i - (int)(i/3)) + p2 * ((int)(i/3) + 1) + i * size, 
-						   size, size);
-	 */
-	
 }
diff --git a/src/grid/Sudoku.java b/src/grid/Sudoku.java
new file mode 100644
index 0000000..2082980
--- /dev/null
+++ b/src/grid/Sudoku.java
@@ -0,0 +1,31 @@
+package grid;
+
+import java.awt.Graphics;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseEvent;
+
+public class Sudoku {
+
+	Grid grid;
+	
+	public Sudoku(){
+		grid = new Grid();
+	}
+	
+	public void update(){
+		grid.update();
+	}
+	
+	public void draw(Graphics g){
+		grid.draw(g);
+	}
+	
+	public void keyPressed(KeyEvent e){
+		grid.keyPressed(e);
+	}
+	
+	public void mousePressed(MouseEvent e){
+		grid.mousePressed(e);
+	}
+	
+}
diff --git a/src/main/Game.java b/src/main/Game.java
index 9b66c0f..4419576 100644
--- a/src/main/Game.java
+++ b/src/main/Game.java
@@ -19,7 +19,7 @@ public class Game extends JPanel implements Runnable,KeyListener,MouseListener {
 	private static final long serialVersionUID = 1L;
 	
 	public static final int WIDTH = 388,HEIGHT = 388;
-	public static final String TITLE = "SUDOKU2";
+	public static final String TITLE = "SUDOKU";
 	
 	private int FPS = 60;
 	
@@ -134,14 +134,7 @@ public static void main(String[] args){
 	}
 
 	public void keyPressed(KeyEvent e) {
-		if(e.getKeyCode() == KeyEvent.VK_C){
-			if(!grid.checkCells()){
-				System.out.println("Grid has been solved!");
-			}else{
-				System.out.println("Grid has error!");
-			}
-		}
-		grid.keyPressed(e.getKeyCode());
+		grid.keyPressed(e);
 	}
 
 	public void keyReleased(KeyEvent e) {
@@ -152,28 +145,23 @@ public void keyTyped(KeyEvent e) {
 		
 	}
 
-	@Override
-	public void mouseClicked(MouseEvent arg0) {
+	public void mouseClicked(MouseEvent e) {
 		
 	}
 
-	@Override
-	public void mouseEntered(MouseEvent arg0) {
+	public void mouseEntered(MouseEvent e) {
 		
 	}
 
-	@Override
-	public void mouseExited(MouseEvent arg0) {
+	public void mouseExited(MouseEvent e) {
 		
 	}
 
-	@Override
 	public void mousePressed(MouseEvent e) {
 		grid.mousePressed(e);
 	}
 
-	@Override
-	public void mouseReleased(MouseEvent arg0) {
+	public void mouseReleased(MouseEvent e) {
 		
 	}