Chapter 05 section 06-07 codes updated.

Author: liuyubobobo

05-Maze-Solver/06-Non-Recursive-DFS-Maze-Solver/src/AlgoVisualizer.java

@@ -34,18 +34,18 @@ public void run(){
         Stack<Position> stack = new Stack<Position>();
         Position entrance = new Position(data.getEntranceX(), data.getEntranceY());
         stack.push(entrance);
-        data.visited[entrance.x][entrance.y] = true;
+        data.visited[entrance.getX()][entrance.getY()] = true;
 
         while(!stack.empty()){
             Position curPos = stack.pop();
-            setData(curPos.x, curPos.y, true);
+            setData(curPos.getX(), curPos.getY(), true);
 
-            if(curPos.x == data.getExitX() && curPos.y == data.getExitY())
+            if(curPos.getX() == data.getExitX() && curPos.getY() == data.getExitY())
                 break;
 
             for(int i = 0 ; i < 4  ; i ++){
-                int newX = curPos.x + d[i][0];
-                int newY = curPos.y + d[i][1];
+                int newX = curPos.getX() + d[i][0];
+                int newY = curPos.getY() + d[i][1];
 
                 if(data.inArea(newX, newY)
                         && !data.visited[newX][newY]

05-Maze-Solver/06-Non-Recursive-DFS-Maze-Solver/src/Position.java

@@ -1,9 +1,12 @@
 public class Position {
 
-    public int x, y;
+    private int x, y;
 
     public Position(int x, int y){
         this.x = x;
         this.y = y;
     }
+
+    public int getX(){return x;}
+    public int getY(){return y;}
 }

05-Maze-Solver/07-More-about-Non-Recursive-DFS-Maze-Solver/src/AlgoVisualizer.java

@@ -34,23 +34,23 @@ private void run(){
         Stack<Position> stack = new Stack<Position>();
         Position entrance = new Position(data.getEntranceX(), data.getEntranceY());
         stack.push(entrance);
-        data.visited[entrance.x][entrance.y] = true;
+        data.visited[entrance.getX()][entrance.getY()] = true;
 
         boolean isSolved = false;
 
         while(!stack.empty()){
             Position curPos = stack.pop();
-            setData(curPos.x, curPos.y, true);
+            setData(curPos.getX(), curPos.getY(), true);
 
-            if(curPos.x == data.getExitX() && curPos.y == data.getExitY()){
+            if(curPos.getX() == data.getExitX() && curPos.getY() == data.getExitY()){
                 isSolved = true;
                 findPath(curPos);
                 break;
             }
 
             for(int i = 0 ; i < 4  ; i ++){
-                int newX = curPos.x + d[i][0];
-                int newY = curPos.y + d[i][1];
+                int newX = curPos.getX() + d[i][0];
+                int newY = curPos.getY() + d[i][1];
 
                 if(data.inArea(newX, newY)
                         && !data.visited[newX][newY]
@@ -72,8 +72,8 @@ private void findPath(Position des){
 
         Position cur = des;
         while(cur != null){
-            data.result[cur.x][cur.y] = true;
-            cur = cur.prev;
+            data.result[cur.getX()][cur.getY()] = true;
+            cur = cur.getPrev();
         }
     }
 

05-Maze-Solver/07-More-about-Non-Recursive-DFS-Maze-Solver/src/Position.java

@@ -1,7 +1,7 @@
 public class Position {
 
-    public int x, y;
-    public Position prev;
+    private int x, y;
+    private Position prev;
 
     public Position(int x, int y, Position prev){
         this.x = x;
@@ -12,4 +12,8 @@ public Position(int x, int y, Position prev){
     public Position(int x, int y){
         this(x, y, null);
     }
+
+    public int getX(){return x;}
+    public int getY(){return y;}
+    public Position getPrev(){return prev;}
 }