diff --git a/src/main/java/ca/recrown/islandsurvivalcraft/pathfinding/DepthFirstSearch.java b/src/main/java/ca/recrown/islandsurvivalcraft/pathfinding/DepthFirstSearch.java index 580d417..348ad0c 100644 --- a/src/main/java/ca/recrown/islandsurvivalcraft/pathfinding/DepthFirstSearch.java +++ b/src/main/java/ca/recrown/islandsurvivalcraft/pathfinding/DepthFirstSearch.java @@ -43,7 +43,7 @@ public class DepthFirstSearch { startNode = new DFSNode(null, x, y, endNode); } - public void setDirectionPosition(int x, int y) { + public void setEndPosition(int x, int y) { endNode = new DFSNode(null, x, y, endNode); } @@ -72,12 +72,11 @@ public class DepthFirstSearch { } /** - * Finds the end node. If an end node is set, it will try going in that - * direction first. Will not set end node if one wasn't found, therefore, - * previous end node data is kept. + * Finds a coordinate determined by a target validator. If an end node is set, + * it will try going in that direction first. * * @param targetValidator - * @return + * @return If it succeeded in finding an end node. */ public boolean findTarget(CoordinateTargetValidatable targetValidator) { if (coordValidatable == null) diff --git a/src/test/java/ca/recrown/islandsurvivalcraft/pathfinding/DepthFirstSearchTest.java b/src/test/java/ca/recrown/islandsurvivalcraft/pathfinding/DepthFirstSearchTest.java index f270f3f..cea4edb 100644 --- a/src/test/java/ca/recrown/islandsurvivalcraft/pathfinding/DepthFirstSearchTest.java +++ b/src/test/java/ca/recrown/islandsurvivalcraft/pathfinding/DepthFirstSearchTest.java @@ -99,7 +99,7 @@ public class DepthFirstSearchTest { { dfs.setValidatable(new Validator(mapA)); dfs.setStartPosition(1, 2); - dfs.setDirectionPosition(1, 0); + dfs.setEndPosition(1, 0); assertTrue(dfs.buildPathToEndNode()); } @@ -108,7 +108,7 @@ public class DepthFirstSearchTest { { dfs.setValidatable(new Validator(mapB)); dfs.setStartPosition(3, 0); - dfs.setDirectionPosition(3, 2); + dfs.setEndPosition(3, 2); assertTrue(dfs.buildPathToEndNode()); } @@ -117,7 +117,7 @@ public class DepthFirstSearchTest { { dfs.setValidatable(new Validator(mapD)); dfs.setStartPosition(0, 0); - dfs.setDirectionPosition(0, 3); + dfs.setEndPosition(0, 3); assertTrue(dfs.buildPathToEndNode()); } @@ -126,7 +126,7 @@ public class DepthFirstSearchTest { { dfs.setValidatable(new Validator(mapC)); dfs.setStartPosition(3, 0); - dfs.setDirectionPosition(3, 2); + dfs.setEndPosition(3, 2); assertFalse(dfs.buildPathToEndNode()); } @@ -135,7 +135,7 @@ public class DepthFirstSearchTest { { dfs.setValidatable(new Validator(mapE)); dfs.setStartPosition(3, 0); - dfs.setDirectionPosition(3, 2); + dfs.setEndPosition(3, 2); assertFalse(dfs.buildPathToEndNode()); } @@ -217,7 +217,7 @@ public class DepthFirstSearchTest { Validator validator = new Validator(mapH); dfs.setValidatable(validator); dfs.setStartPosition(3, 0); - dfs.setDirectionPosition(42, 84); + dfs.setEndPosition(42, 84); assertTrue(dfs.findTarget(validator)); assertEquals(95, dfs.getFoundNode().getX());