Cleaned code a bit

Author: Pedro Geadas

src/com/ai/astar/AStar.java

@@ -9,13 +9,13 @@
  * @version 2.1, 2017-02-23
  */
 public class AStar {
-    private static int DEFAULT_HV_COST = 10; // Horizontal - Vertical Cost
-    private static int DEFAULT_DIAGONAL_COST = 14;
-    private int hvCost;
-    private int diagonalCost;
-    private Node[][] searchArea;
-    private PriorityQueue<Node> openList;
-    private Set<Node> closedSet;
+    private static final int DEFAULT_HV_COST = 10; // Horizontal - Vertical Cost
+    private static final int DEFAULT_DIAGONAL_COST = 14;
+    private final int hvCost;
+    private final int diagonalCost;
+    private final Node[][] searchArea;
+    private final PriorityQueue<Node> openList;
+    private final Set<Node> closedSet;
     private Node initialNode;
     private Node finalNode;
 
@@ -25,12 +25,7 @@ public AStar(int rows, int cols, Node initialNode, Node finalNode, int hvCost, i
         setInitialNode(initialNode);
         setFinalNode(finalNode);
         this.searchArea = new Node[rows][cols];
-        this.openList = new PriorityQueue<Node>(new Comparator<Node>() {
-            @Override
-            public int compare(Node node0, Node node1) {
-                return Integer.compare(node0.getF(), node1.getF());
-            }
-        });
+        this.openList = new PriorityQueue<>(Comparator.comparingInt(Node::getF));
         setNodes();
         this.closedSet = new HashSet<>();
     }
@@ -50,9 +45,9 @@ private void setNodes() {
     }
 
     public void setBlocks(int[][] blocksArray) {
-        for (int i = 0; i < blocksArray.length; i++) {
-            int row = blocksArray[i][0];
-            int col = blocksArray[i][1];
+        for (int[] ints : blocksArray) {
+            int row = ints[0];
+            int col = ints[1];
             setBlock(row, col);
         }
     }
@@ -68,11 +63,11 @@ public List<Node> findPath() {
                 addAdjacentNodes(currentNode);
             }
         }
-        return new ArrayList<Node>();
+        return new ArrayList<>();
     }
 
     private List<Node> getPath(Node currentNode) {
-        List<Node> path = new ArrayList<Node>();
+        List<Node> path = new ArrayList<>();
         path.add(currentNode);
         Node parent;
         while ((parent = currentNode.getParent()) != null) {
@@ -106,12 +101,11 @@ private void addAdjacentLowerRow(Node currentNode) {
     private void addAdjacentMiddleRow(Node currentNode) {
         int row = currentNode.getRow();
         int col = currentNode.getCol();
-        int middleRow = row;
         if (col - 1 >= 0) {
-            checkNode(currentNode, col - 1, middleRow, getHvCost());
+            checkNode(currentNode, col - 1, row, getHvCost());
         }
         if (col + 1 < getSearchArea()[0].length) {
-            checkNode(currentNode, col + 1, middleRow, getHvCost());
+            checkNode(currentNode, col + 1, row, getHvCost());
         }
     }
 
@@ -153,17 +147,13 @@ private boolean isFinalNode(Node currentNode) {
     }
 
     private boolean isEmpty(PriorityQueue<Node> openList) {
-        return openList.size() == 0;
+        return openList.isEmpty();
     }
 
     private void setBlock(int row, int col) {
         this.searchArea[row][col].setBlock(true);
     }
 
-    public Node getInitialNode() {
-        return initialNode;
-    }
-
     public void setInitialNode(Node initialNode) {
         this.initialNode = initialNode;
     }
@@ -180,40 +170,21 @@ public Node[][] getSearchArea() {
         return searchArea;
     }
 
-    public void setSearchArea(Node[][] searchArea) {
-        this.searchArea = searchArea;
-    }
-
     public PriorityQueue<Node> getOpenList() {
         return openList;
     }
 
-    public void setOpenList(PriorityQueue<Node> openList) {
-        this.openList = openList;
-    }
-
     public Set<Node> getClosedSet() {
         return closedSet;
     }
 
-    public void setClosedSet(Set<Node> closedSet) {
-        this.closedSet = closedSet;
-    }
-
     public int getHvCost() {
         return hvCost;
     }
 
-    public void setHvCost(int hvCost) {
-        this.hvCost = hvCost;
-    }
-
     private int getDiagonalCost() {
         return diagonalCost;
     }
 
-    private void setDiagonalCost(int diagonalCost) {
-        this.diagonalCost = diagonalCost;
-    }
 }
 

src/com/ai/astar/Node.java

@@ -11,8 +11,8 @@ public class Node {
     private int g;
     private int f;
     private int h;
-    private int row;
-    private int col;
+    private final int row;
+    private final int col;
     private boolean isBlock;
     private Node parent;
 
@@ -47,8 +47,18 @@ private void calculateFinalCost() {
         setF(finalCost);
     }
 
+    @Override
+    public int hashCode() {
+        int result = row;
+        result = 31 * result + col;
+        return result;
+    }
+
     @Override
     public boolean equals(Object arg0) {
+        if (arg0 == null) {
+            return false;
+        }
         Node other = (Node) arg0;
         return this.getRow() == other.getRow() && this.getCol() == other.getCol();
     }
@@ -62,10 +72,6 @@ public int getH() {
         return h;
     }
 
-    public void setH(int h) {
-        this.h = h;
-    }
-
     public int getG() {
         return g;
     }
@@ -102,15 +108,8 @@ public int getRow() {
         return row;
     }
 
-    public void setRow(int row) {
-        this.row = row;
-    }
-
     public int getCol() {
         return col;
     }
 
-    public void setCol(int col) {
-        this.col = col;
-    }
 }