Chapter 08 restructured.

Author: liuyubobobo

08-Move-the-Box-Solver/06-Match/src/Board.java

@@ -85,6 +85,20 @@ public void run(){
         return;
     }
 
+    private void drop(){
+
+        for(int j = 0 ; j < M ; j ++){
+            int cur = N-1;
+            for(int i = N-1 ; i >= 0 ; i --)
+                if(data[i][j] != EMPTY){
+                    swap(cur, j, i, j);
+                    cur--;
+                }
+        }
+
+        return;
+    }
+
     private static int d[][] = {{0, 1}, {1, 0}};
     private boolean match(){
 
@@ -118,17 +132,4 @@ private boolean match(){
         return isMatched;
     }
 
-    private void drop(){
-
-        for(int j = 0 ; j < M ; j ++){
-            int cur = N-1;
-            for(int i = N-1 ; i >= 0 ; i --)
-                if(data[i][j] != EMPTY){
-                    swap(cur, j, i, j);
-                    cur--;
-                }
-        }
-
-        return;
-    }
 }

08-Move-the-Box-Solver/09-More-about-Optimization/level/boston_16.txt renamed to 08-Move-the-Box-Solver/07-Show-the-Results/level/boston_16.txt

@@ -1,8 +1,4 @@
-import java.awt.Graphics2D;
-import java.awt.Graphics;
-import java.awt.Dimension;
-import java.awt.Color;
-import java.awt.RenderingHints;
+import java.awt.*;
 import java.util.*;
 import javax.swing.*;
 

08-Move-the-Box-Solver/07-Show-the-Results/src/AlgoFrame.java

@@ -32,8 +32,6 @@ private void run(){
             System.out.println("The game has a solution!");
         else
             System.out.println("The game does NOT have a solution.");
-
-        setData();
     }
 
     private void setData(){
@@ -43,7 +41,8 @@ private void setData(){
 
     public static void main(String[] args) {
 
-        String filename = "level/boston_09.txt";
+        // String filename = "level/boston_09.txt";
+        String filename = "level/boston_16.txt";
 
         AlgoVisualizer vis = new AlgoVisualizer(filename);
     }

08-Move-the-Box-Solver/07-Show-the-Results/src/AlgoVisualizer.java

@@ -136,11 +136,9 @@ private void drop(){
             int cur = N-1;
             for(int i = N-1 ; i >= 0 ; i --)
                 if(data[i][j] != EMPTY){
-                    data[cur][j] = data[i][j];
+                    swap(cur, j, i, j);
                     cur--;
                 }
-            for(; cur >= 0 ; cur --)
-                data[cur][j] = EMPTY;
         }
 
         return;

08-Move-the-Box-Solver/07-Show-the-Results/src/Board.java

@@ -64,16 +64,16 @@ public boolean inArea(int x, int y){
 
     public boolean solve(){
 
-        if(maxTurn <= 0)
+        if(maxTurn < 0)
             return false;
 
-        return solve(new Board(starterBoard), maxTurn);
+        return solve(starterBoard, maxTurn);
     }
 
-    private static int d[][] = {{-1, 0}, {0, 1}, {0,-1}};
+    private static int d[][] = {{1, 0}, {0, 1}, {0,-1}};
     private boolean solve(Board board, int turn){
 
-        if(board == null)
+        if(board == null || turn < 0)
             throw new IllegalArgumentException("board can not be null in solve function!");
 
         if(turn == 0)

08-Move-the-Box-Solver/07-Show-the-Results/src/GameData.java

@@ -1,8 +1,4 @@
-import java.awt.Graphics2D;
-import java.awt.Graphics;
-import java.awt.Dimension;
-import java.awt.Color;
-import java.awt.RenderingHints;
+import java.awt.*;
 import java.util.*;
 import javax.swing.*;
 
@@ -103,12 +99,6 @@ public void paintComponent(Graphics g) {
                         String text = String.format("( %d , %d )", i, j);
                         AlgoVisHelper.drawText(g2d, text, j*h + h/2, i*w + w/2);
                     }
-
-                    if( i == data.clickx && j == data.clicky) {
-                        AlgoVisHelper.setColor(g2d, AlgoVisHelper.LightBlue);
-                        AlgoVisHelper.setStrokeWidth(g2d, 4);
-                        AlgoVisHelper.strokeRectangle(g2d, j * h + 2, i * w + 2, w - 4, h - 4);
-                    }
                 }
         }
 

08-Move-the-Box-Solver/Chapter-08-Completed-Codes/Move-the-Box-Solver/src/AlgoFrame.java

@@ -1,6 +1,5 @@
 import java.awt.*;
 import java.awt.event.*;
-import javax.swing.*;
 
 public class AlgoVisualizer {
 
@@ -18,7 +17,7 @@ public AlgoVisualizer(String filename){
 
         EventQueue.invokeLater(() -> {
             frame = new AlgoFrame("Move the Box Solver", sceneWidth,sceneHeight);
-            frame.addMouseListener(new AlgoMouseListener());
+
             new Thread(() -> {
                 run();
             }).start();
@@ -27,77 +26,22 @@ public AlgoVisualizer(String filename){
 
     private void run(){
 
-        setData(-1, -1);
+        setData();
 
         if(data.solve())
             System.out.println("The game has a solution!");
         else
             System.out.println("The game does NOT have a solution.");
-
-        setData(-1, -1);
     }
 
-    private void setData(int clickx, int clicky){
-        data.clickx = clickx;
-        data.clicky = clicky;
-
+    private void setData(){
         frame.render(data);
         AlgoVisHelper.pause(DELAY);
     }
 
-    public void addAlgoMouseListener(){
-        frame.addMouseListener(new AlgoMouseListener());
-    }
-
-    private Position clickPos1 = null;
-    private Position clickPos2 = null;
-    private class AlgoMouseListener extends MouseAdapter{
-
-        @Override
-        public void mouseReleased(MouseEvent event){
-            event.translatePoint(
-                    -(int)(frame.getBounds().width - frame.getCanvasWidth()),
-                    -(int)(frame.getBounds().height - frame.getCanvasHeight())
-            );
-
-            Point pos = event.getPoint();
-            //System.out.println(pos.x + " , " + pos.y );
-
-            int w = frame.getCanvasWidth() / data.M();
-            int h = frame.getCanvasHeight() / data.N();
-
-            int x = pos.y / h;
-            int y = pos.x / w;
-            //System.out.println(x + " , " + y);
-
-            if(SwingUtilities.isLeftMouseButton(event)){
-                if(data.inArea(x, y)){
-                    setData(x, y);
-                    if(clickPos1 == null){
-                        clickPos1 = new Position(x, y);
-                    }
-                    else{
-                        clickPos2 = new Position(x, y);
-                        if(clickPos2.nextTo(clickPos1)){
-                            data.getShowBoard().swap(clickPos1.getX(), clickPos1.getY(), clickPos2.getX(), clickPos2.getY());
-                            data.getShowBoard().run();
-                        }
-                        clickPos1 = null;
-                        clickPos2 = null;
-                        setData(-1, -1);
-                    }
-                }
-                else{
-                    setData(-1, -1);
-                    clickPos1 = null;
-                    clickPos2 = null;
-                }
-            }
-        }
-    }
-
     public static void main(String[] args) {
 
+        // String filename = "level/boston_09.txt";
         String filename = "level/boston_16.txt";
 
         AlgoVisualizer vis = new AlgoVisualizer(filename);

08-Move-the-Box-Solver/Chapter-08-Completed-Codes/Move-the-Box-Solver/src/AlgoVisualizer.java

@@ -151,30 +151,4 @@ public void printSwapInfo(){
         System.out.println(swapString);
         return;
     }
-
-    @Override
-    public int hashCode(){
-
-        StringBuilder s = new StringBuilder();
-        for(int i = 0 ; i < data.length ; i ++)
-            s.append(data[i]);
-        return s.toString().hashCode();
-    }
-
-    @Override
-    public boolean equals(Object another){
-
-        if(!(another instanceof Board))
-            return false;
-
-        if( another == this)
-            return true;
-
-        Board anotherBoard = (Board)another;
-        for(int i = 0 ; i < N ; i ++)
-            for(int j = 0 ; j < M ; j ++)
-                if(this.data[i][j] != anotherBoard.data[i][j])
-                    return false;
-        return true;
-    }
 }

08-Move-the-Box-Solver/Chapter-08-Completed-Codes/Move-the-Box-Solver/src/Board.java

@@ -4,17 +4,14 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Scanner;
-import java.util.HashSet;
+
 
 public class GameData {
 
     private int maxTurn;
     private int N, M;
     private Board starterBoard;
     private Board showBoard;
-    private HashSet<Board> searchedBoards;
-
-    public int clickx = -1, clicky = -1;
 
     public GameData(String filename){
 
@@ -44,11 +41,9 @@ public GameData(String filename){
             this.N = starterBoard.N();
             this.M = starterBoard.M();
 
-            //starterBoard.print();
+            starterBoard.print();
 
             showBoard = new Board(starterBoard);
-
-            searchedBoards = new HashSet<Board>();
         }
         catch(IOException e){
             e.printStackTrace();
@@ -72,21 +67,13 @@ public boolean solve(){
         if(maxTurn < 0)
             return false;
 
-        long startTime = System.currentTimeMillis();
-
-        searchedBoards.add(starterBoard);
-        boolean ret = solve(starterBoard, maxTurn);
-
-        long endTime = System.currentTimeMillis();
-        System.out.println( "Time : " + (endTime-startTime) + "ms" );
-
-        return ret;
+        return solve(starterBoard, maxTurn);
     }
 
-    private static int d[][] = {{1, 0}, {0, -1}, {0, 1}};
+    private static int d[][] = {{1, 0}, {0, 1}, {0,-1}};
     private boolean solve(Board board, int turn){
 
-        if(board == null)
+        if(board == null || turn < 0)
             throw new IllegalArgumentException("board can not be null in solve function!");
 
         if(turn == 0)
@@ -106,18 +93,12 @@ private boolean solve(Board board, int turn){
                             Board nextBoard = new Board(board, board, swapString);
                             nextBoard.swap(x, y, newX, newY);
                             nextBoard.run();
-
-                            if(!searchedBoards.contains(nextBoard)){
-                                searchedBoards.add(nextBoard);
-                                if(solve(nextBoard, turn-1))
-                                    return true;
-                            }
-
+                            if(solve(nextBoard, turn-1))
+                                return true;
                         }
                     }
                 }
 
         return false;
     }
-
 }

08-Move-the-Box-Solver/Chapter-08-Completed-Codes/Move-the-Box-Solver/src/GameData.java

@@ -0,0 +1,8 @@
+2
+.........
+....A....
+...BCB...
+...ADA...
+..BDECB..
+..DFAFC..
+.BAAEFEB.