From 49c3ac9e04dbcaa7a63db3fa87bfa52a144e6235 Mon Sep 17 00:00:00 2001 From: Alexander Ruban Date: Thu, 3 Apr 2025 14:51:03 -0700 Subject: [PATCH 1/5] Implemented main and helper methods in class. --- src/SalamanderSearch.java | 73 +++++++ src/SalamanderSearchTest.java | 394 +++++++++++++++++----------------- 2 files changed, 270 insertions(+), 197 deletions(-) diff --git a/src/SalamanderSearch.java b/src/SalamanderSearch.java index 688cda7..43c7968 100644 --- a/src/SalamanderSearch.java +++ b/src/SalamanderSearch.java @@ -43,6 +43,79 @@ public static void main(String[] args) { * @return whether the salamander can reach the food */ public static boolean canReach(char[][] enclosure) { + int[] start = salamanderLocation(enclosure); + boolean[][] visited = new boolean[enclosure.length][enclosure[0].length]; + + return canReach(enclosure, start, visited); + } + + public static boolean canReach(char[][] enclosure, int[] current, boolean[][] visited) { + int curR = current[0]; + int curC = current[1]; + + if (visited[curR][curC]) return false; + if (enclosure[curR][curC] == 'f') return true; + + visited[curR][curC] = true; + + List moves = possibleMoves(enclosure, current); + + for (int[] move : moves) { + if (canReach(enclosure, move, visited)) return true; + } + return false; } + + public static int[] salamanderLocation(char[][] enclosure) { + for (int r = 0; r < enclosure.length; r++) { + for (int c = 0; c < enclosure[r].length; c++) { + if (enclosure[r][c] == 's') { + return new int[]{r, c}; + } + } + } + throw new IllegalArgumentException("No salamander present"); + } + + public static List possibleMoves(char[][] enclosure, int[] current) { + int curR = current[0]; + int curC = current[1]; + + List moves = new ArrayList<>(); + + // UP + int newR = curR - 1; + int newC = curC; + + if (newR >= 0 && enclosure[newR][newC] != 'W') { + moves.add(new int[]{newR, newC}); + } + + // DOWN + newR = curR + 1; + newC = curC; + + if (newR < enclosure.length && enclosure[newR][newC] != 'W') { + moves.add(new int[]{newR, newC}); + } + + // LEFT + newR = curR; + newC = curC - 1; + + if (newC >= 0 && enclosure[newR][newC] != 'W') { + moves.add(new int[]{newR, newC}); + } + + // RIGHT + newR = curR; + newC = curC + 1; + + if (newC < enclosure[0].length && enclosure[newR][newC] != 'W') { + moves.add(new int[]{newR, newC}); + } + + return moves; + } } diff --git a/src/SalamanderSearchTest.java b/src/SalamanderSearchTest.java index ddad9de..a8b5af2 100644 --- a/src/SalamanderSearchTest.java +++ b/src/SalamanderSearchTest.java @@ -34,203 +34,203 @@ public void canReach_NoPath() { assertFalse(actual); } - // @Test - // public void testSalamanderLocation_centerOfGrid() { - // char[][] enclosure = { - // {'.', '.', '.'}, - // {'.', 's', '.'}, - // {'.', '.', '.'} - // }; - // int[] expected = {1, 1}; - // assertArrayEquals(expected, SalamanderSearch.salamanderLocation(enclosure)); - // } - - // @Test - // public void testSalamanderLocation_topLeftCorner() { - // char[][] enclosure = { - // {'s', '.', '.'}, - // {'.', '.', '.'}, - // {'.', '.', '.'} - // }; - // int[] expected = {0, 0}; - // assertArrayEquals(expected, SalamanderSearch.salamanderLocation(enclosure)); - // } - - // @Test - // public void testSalamanderLocation_notFound_throwsException() { - // char[][] enclosure = { - // {'.', '.', '.'}, - // {'.', '.', '.'}, - // {'.', '.', '.'} - // }; - // Exception exception = assertThrows(IllegalArgumentException.class, () -> { - // SalamanderSearch.salamanderLocation(enclosure); - // }); - // assertEquals("No salamander present", exception.getMessage()); - // } - - - // @Test - // public void testSalamanderLocation_at_1_2() { - // char[][] enclosure = { - // {'.', '.', '.'}, - // {'.', '.', 's'}, - // {'.', '.', '.'} - // }; - // int[] expected = {1, 2}; - // assertArrayEquals(expected, SalamanderSearch.salamanderLocation(enclosure)); - // } - - // @Test - // public void testPossibleMoves_allDirectionsOpen() { - // char[][] enclosure = { - // {'.', '.', '.'}, - // {'.', 's', '.'}, - // {'.', '.', '.'} - // }; - // int[] location = {1, 1}; - // List moves = SalamanderSearch.possibleMoves(enclosure, location); - // Set moveSet = toSet(moves); - - // assertEquals(4, moves.size()); - // assertTrue(moveSet.contains("0,1")); // up - // assertTrue(moveSet.contains("2,1")); // down - // assertTrue(moveSet.contains("1,0")); // left - // assertTrue(moveSet.contains("1,2")); // right - // } - - // @Test - // public void testPossibleMoves_allDirectionsBlockedByWalls() { - // char[][] enclosure = { - // {'W', 'W', 'W'}, - // {'W', 's', 'W'}, - // {'W', 'W', 'W'} - // }; - // int[] location = {1, 1}; - // List moves = SalamanderSearch.possibleMoves(enclosure, location); - // assertTrue(moves.isEmpty()); - // } - - // @Test - // public void testPossibleMoves_partialEdge() { - // char[][] enclosure = { - // {'s', '.', '.'} - // }; - // int[] location = {0, 0}; - // List moves = SalamanderSearch.possibleMoves(enclosure, location); - // Set moveSet = toSet(moves); - - // assertEquals(1, moves.size()); - // assertTrue(moveSet.contains("0,1")); // only right - // } - - // @Test - // public void testPossibleMoves_oneOpen_twoWalls_oneEdge() { - // // Salamander at (1, 1) - // // Up is W, down is wall, left is edge (0), right is open - // char[][] enclosure = { - // {'W', 'W', 'W'}, - // {'.', 's', '.'}, - // {'W', 'W', 'W'} - // }; - // int[] location = {1, 1}; - // List moves = SalamanderSearch.possibleMoves(enclosure, location); - // Set moveSet = toSet(moves); - - // assertEquals(2, moves.size()); - // assertTrue(moveSet.contains("1,2")); - // assertTrue(moveSet.contains("1,0")); - // } - - // @Test - // public void testPossibleMoves_blockedAboveByWall() { - // char[][] enclosure = { - // {'.', 'W', '.'}, - // {'.', 's', '.'}, - // {'.', '.', '.'} - // }; - // int[] location = {1, 1}; - // List moves = SalamanderSearch.possibleMoves(enclosure, location); - // Set moveSet = toSet(moves); - - // assertFalse(moveSet.contains("0,1")); // up blocked - // assertTrue(moveSet.contains("2,1")); // down open - // assertTrue(moveSet.contains("1,0")); // left open - // assertTrue(moveSet.contains("1,2")); // right open - // } - - // @Test - // public void testPossibleMoves_blockedBelowByWall() { - // char[][] enclosure = { - // {'.', '.', '.'}, - // {'.', 's', '.'}, - // {'.', 'W', '.'} - // }; - // int[] location = {1, 1}; - // Set moveSet = toSet(SalamanderSearch.possibleMoves(enclosure, location)); - - // assertTrue(moveSet.contains("0,1")); // up open - // assertFalse(moveSet.contains("2,1")); // down blocked - // assertTrue(moveSet.contains("1,0")); // left open - // assertTrue(moveSet.contains("1,2")); // right open - // } - - // @Test - // public void testPossibleMoves_blockedLeftByWall() { - // char[][] enclosure = { - // {'.', '.', '.'}, - // {'W', 's', '.'}, - // {'.', '.', '.'} - // }; - // int[] location = {1, 1}; - // Set moveSet = toSet(SalamanderSearch.possibleMoves(enclosure, location)); - - // assertTrue(moveSet.contains("0,1")); // up open - // assertTrue(moveSet.contains("2,1")); // down open - // assertFalse(moveSet.contains("1,0")); // left blocked - // assertTrue(moveSet.contains("1,2")); // right open - // } - - // @Test - // public void testPossibleMoves_blockedRightByWall() { - // char[][] enclosure = { - // {'.', '.', '.'}, - // {'.', 's', 'W'}, - // {'.', '.', '.'} - // }; - // int[] location = {1, 1}; - // Set moveSet = toSet(SalamanderSearch.possibleMoves(enclosure, location)); - - // assertTrue(moveSet.contains("0,1")); // up open - // assertTrue(moveSet.contains("2,1")); // down open - // assertTrue(moveSet.contains("1,0")); // left open - // assertFalse(moveSet.contains("1,2")); // right blocked - // } - - // @Test - // public void testPossibleMoves_topLeftCornerWithOneOpen() { - // char[][] enclosure = { - // {'s', 'W'}, - // {'W', '.'} - // }; - // int[] location = {0, 0}; - // List moves = SalamanderSearch.possibleMoves(enclosure, location); - - // assertTrue(moves.isEmpty()); // surrounded by walls/edges - // } - - // @Test - // public void testPossibleMoves_rightEdgeWithOpenLeft() { - // char[][] enclosure = { - // {'.', '.', 's'} - // }; - // int[] location = {0, 2}; - // List moves = SalamanderSearch.possibleMoves(enclosure, location); - // Set moveSet = toSet(moves); - - // assertEquals(1, moves.size()); - // assertTrue(moveSet.contains("0,1")); - // } + @Test + public void testSalamanderLocation_centerOfGrid() { + char[][] enclosure = { + {'.', '.', '.'}, + {'.', 's', '.'}, + {'.', '.', '.'} + }; + int[] expected = {1, 1}; + assertArrayEquals(expected, SalamanderSearch.salamanderLocation(enclosure)); + } + + @Test + public void testSalamanderLocation_topLeftCorner() { + char[][] enclosure = { + {'s', '.', '.'}, + {'.', '.', '.'}, + {'.', '.', '.'} + }; + int[] expected = {0, 0}; + assertArrayEquals(expected, SalamanderSearch.salamanderLocation(enclosure)); + } + + @Test + public void testSalamanderLocation_notFound_throwsException() { + char[][] enclosure = { + {'.', '.', '.'}, + {'.', '.', '.'}, + {'.', '.', '.'} + }; + Exception exception = assertThrows(IllegalArgumentException.class, () -> { + SalamanderSearch.salamanderLocation(enclosure); + }); + assertEquals("No salamander present", exception.getMessage()); + } + + + @Test + public void testSalamanderLocation_at_1_2() { + char[][] enclosure = { + {'.', '.', '.'}, + {'.', '.', 's'}, + {'.', '.', '.'} + }; + int[] expected = {1, 2}; + assertArrayEquals(expected, SalamanderSearch.salamanderLocation(enclosure)); + } + + @Test + public void testPossibleMoves_allDirectionsOpen() { + char[][] enclosure = { + {'.', '.', '.'}, + {'.', 's', '.'}, + {'.', '.', '.'} + }; + int[] location = {1, 1}; + List moves = SalamanderSearch.possibleMoves(enclosure, location); + Set moveSet = toSet(moves); + + assertEquals(4, moves.size()); + assertTrue(moveSet.contains("0,1")); // up + assertTrue(moveSet.contains("2,1")); // down + assertTrue(moveSet.contains("1,0")); // left + assertTrue(moveSet.contains("1,2")); // right + } + + @Test + public void testPossibleMoves_allDirectionsBlockedByWalls() { + char[][] enclosure = { + {'W', 'W', 'W'}, + {'W', 's', 'W'}, + {'W', 'W', 'W'} + }; + int[] location = {1, 1}; + List moves = SalamanderSearch.possibleMoves(enclosure, location); + assertTrue(moves.isEmpty()); + } + + @Test + public void testPossibleMoves_partialEdge() { + char[][] enclosure = { + {'s', '.', '.'} + }; + int[] location = {0, 0}; + List moves = SalamanderSearch.possibleMoves(enclosure, location); + Set moveSet = toSet(moves); + + assertEquals(1, moves.size()); + assertTrue(moveSet.contains("0,1")); // only right + } + + @Test + public void testPossibleMoves_oneOpen_twoWalls_oneEdge() { + // Salamander at (1, 1) + // Up is W, down is wall, left is edge (0), right is open + char[][] enclosure = { + {'W', 'W', 'W'}, + {'.', 's', '.'}, + {'W', 'W', 'W'} + }; + int[] location = {1, 1}; + List moves = SalamanderSearch.possibleMoves(enclosure, location); + Set moveSet = toSet(moves); + + assertEquals(2, moves.size()); + assertTrue(moveSet.contains("1,2")); + assertTrue(moveSet.contains("1,0")); + } + + @Test + public void testPossibleMoves_blockedAboveByWall() { + char[][] enclosure = { + {'.', 'W', '.'}, + {'.', 's', '.'}, + {'.', '.', '.'} + }; + int[] location = {1, 1}; + List moves = SalamanderSearch.possibleMoves(enclosure, location); + Set moveSet = toSet(moves); + + assertFalse(moveSet.contains("0,1")); // up blocked + assertTrue(moveSet.contains("2,1")); // down open + assertTrue(moveSet.contains("1,0")); // left open + assertTrue(moveSet.contains("1,2")); // right open + } + + @Test + public void testPossibleMoves_blockedBelowByWall() { + char[][] enclosure = { + {'.', '.', '.'}, + {'.', 's', '.'}, + {'.', 'W', '.'} + }; + int[] location = {1, 1}; + Set moveSet = toSet(SalamanderSearch.possibleMoves(enclosure, location)); + + assertTrue(moveSet.contains("0,1")); // up open + assertFalse(moveSet.contains("2,1")); // down blocked + assertTrue(moveSet.contains("1,0")); // left open + assertTrue(moveSet.contains("1,2")); // right open + } + + @Test + public void testPossibleMoves_blockedLeftByWall() { + char[][] enclosure = { + {'.', '.', '.'}, + {'W', 's', '.'}, + {'.', '.', '.'} + }; + int[] location = {1, 1}; + Set moveSet = toSet(SalamanderSearch.possibleMoves(enclosure, location)); + + assertTrue(moveSet.contains("0,1")); // up open + assertTrue(moveSet.contains("2,1")); // down open + assertFalse(moveSet.contains("1,0")); // left blocked + assertTrue(moveSet.contains("1,2")); // right open + } + + @Test + public void testPossibleMoves_blockedRightByWall() { + char[][] enclosure = { + {'.', '.', '.'}, + {'.', 's', 'W'}, + {'.', '.', '.'} + }; + int[] location = {1, 1}; + Set moveSet = toSet(SalamanderSearch.possibleMoves(enclosure, location)); + + assertTrue(moveSet.contains("0,1")); // up open + assertTrue(moveSet.contains("2,1")); // down open + assertTrue(moveSet.contains("1,0")); // left open + assertFalse(moveSet.contains("1,2")); // right blocked + } + + @Test + public void testPossibleMoves_topLeftCornerWithOneOpen() { + char[][] enclosure = { + {'s', 'W'}, + {'W', '.'} + }; + int[] location = {0, 0}; + List moves = SalamanderSearch.possibleMoves(enclosure, location); + + assertTrue(moves.isEmpty()); // surrounded by walls/edges + } + + @Test + public void testPossibleMoves_rightEdgeWithOpenLeft() { + char[][] enclosure = { + {'.', '.', 's'} + }; + int[] location = {0, 2}; + List moves = SalamanderSearch.possibleMoves(enclosure, location); + Set moveSet = toSet(moves); + + assertEquals(1, moves.size()); + assertTrue(moveSet.contains("0,1")); + } private Set toSet(List list) { From 67b4e84e666d4847f982f0884bd4af18de6d5033 Mon Sep 17 00:00:00 2001 From: Alexander Ruban Date: Fri, 4 Apr 2025 11:36:03 -0700 Subject: [PATCH 2/5] Added more in depth tests. --- src/SalamanderSearchTest.java | 41 +++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/src/SalamanderSearchTest.java b/src/SalamanderSearchTest.java index a8b5af2..76ec197 100644 --- a/src/SalamanderSearchTest.java +++ b/src/SalamanderSearchTest.java @@ -34,6 +34,47 @@ public void canReach_NoPath() { assertFalse(actual); } + @Test + public void canReach_NoSalamanderOrFood() { + char[][] enclosure = { + {'.','.','.','.','.','.'}, + {'W','W','W','W','.','.'}, + {'.','.','W','.','.','W'}, + {'.','W','.','.','W','.'}, + {'W','.','W','.','.','.'}, + }; + Exception exception = assertThrows(IllegalArgumentException.class, () -> { + SalamanderSearch.canReach(enclosure); + }); + assertEquals("No salamander present", exception.getMessage()); + } + + @Test + public void canReach_FoodSurroundedByWalls() { + char[][] enclosure = { + {'s','.','.','.','.'}, + {'.','W','W','W','.'}, + {'.','W','f','W','.'}, + {'.','W','W','W','.'}, + {'.','.','.','.','.'}, + }; + boolean actual = SalamanderSearch.canReach(enclosure); + assertFalse(actual); + } + + @Test + public void canReach_MultiplePaths() { + char[][] enclosure = { + {'.','.','.','f','.','.'}, + {'.','W','W','.','W','.'}, + {'.','W','.','.','W','.'}, + {'.','W','W','.','W','.'}, + {'s','.','.','.','.','.'} + }; + boolean actual = SalamanderSearch.canReach(enclosure); + assertTrue(actual); + } + @Test public void testSalamanderLocation_centerOfGrid() { char[][] enclosure = { From ab9228dc924906ec78549a840578083a386a4538 Mon Sep 17 00:00:00 2001 From: Alexander Ruban Date: Tue, 8 Apr 2025 14:25:38 -0700 Subject: [PATCH 3/5] Refactored possibleMoves to be shorter. --- src/SalamanderSearch.java | 77 +++++++++++++++++++++++++++------------ 1 file changed, 54 insertions(+), 23 deletions(-) diff --git a/src/SalamanderSearch.java b/src/SalamanderSearch.java index 43c7968..97a5459 100644 --- a/src/SalamanderSearch.java +++ b/src/SalamanderSearch.java @@ -1,5 +1,7 @@ import java.util.ArrayList; +import java.util.HashSet; import java.util.List; +import java.util.Set; public class SalamanderSearch { public static void main(String[] args) { @@ -18,6 +20,17 @@ public static void main(String[] args) { {'f','W','.','.','W','.'}, {'W','.','W','.','.','.'}, }; + + Set coordinateSet = new HashSet<>(); + int[] coord1 = new int[]{1, 5}; + int[] coord2 = new int[]{3, 7}; + int[] coord3 = new int[]{1, 5}; + + coordinateSet.add(coord1); + coordinateSet.add(coord2); + coordinateSet.add(coord3); + + System.out.println(coordinateSet.size()); } /** @@ -84,37 +97,55 @@ public static List possibleMoves(char[][] enclosure, int[] current) { List moves = new ArrayList<>(); - // UP - int newR = curR - 1; - int newC = curC; + int[][] directions = new int[][] { + {-1, 0}, + {1, 0}, + {0, -1}, + {0, 1} + }; + + for(int[] direction : directions) { + int newR = curR + direction[0]; + int newC = curC + direction[1]; - if (newR >= 0 && enclosure[newR][newC] != 'W') { - moves.add(new int[]{newR, newC}); + if (newR >= 0 && newR < enclosure.length && + newC >= 0 && newC < enclosure[0].length && + enclosure[newR][newC] != 'W') { + moves.add(new int[]{newR, newC}); + } } - // DOWN - newR = curR + 1; - newC = curC; + // // UP + // int newR = curR - 1; + // int newC = curC; - if (newR < enclosure.length && enclosure[newR][newC] != 'W') { - moves.add(new int[]{newR, newC}); - } + // if (newR >= 0 && enclosure[newR][newC] != 'W') { + // moves.add(new int[]{newR, newC}); + // } - // LEFT - newR = curR; - newC = curC - 1; + // // DOWN + // newR = curR + 1; + // newC = curC; - if (newC >= 0 && enclosure[newR][newC] != 'W') { - moves.add(new int[]{newR, newC}); - } + // if (newR < enclosure.length && enclosure[newR][newC] != 'W') { + // moves.add(new int[]{newR, newC}); + // } - // RIGHT - newR = curR; - newC = curC + 1; + // // LEFT + // newR = curR; + // newC = curC - 1; - if (newC < enclosure[0].length && enclosure[newR][newC] != 'W') { - moves.add(new int[]{newR, newC}); - } + // if (newC >= 0 && enclosure[newR][newC] != 'W') { + // moves.add(new int[]{newR, newC}); + // } + + // // RIGHT + // newR = curR; + // newC = curC + 1; + + // if (newC < enclosure[0].length && enclosure[newR][newC] != 'W') { + // moves.add(new int[]{newR, newC}); + // } return moves; } From bc6f8bceb5c242b8dd3fbb4ba5128372602047f4 Mon Sep 17 00:00:00 2001 From: Alexander Ruban Date: Wed, 9 Apr 2025 14:41:32 -0700 Subject: [PATCH 4/5] Improved logic in class. --- src/Position.java | 1 + src/SalamanderSearch.java | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 src/Position.java diff --git a/src/Position.java b/src/Position.java new file mode 100644 index 0000000..0bb2282 --- /dev/null +++ b/src/Position.java @@ -0,0 +1 @@ +public record Position(int row, int col) {} \ No newline at end of file diff --git a/src/SalamanderSearch.java b/src/SalamanderSearch.java index 97a5459..4249bf8 100644 --- a/src/SalamanderSearch.java +++ b/src/SalamanderSearch.java @@ -1,4 +1,5 @@ import java.util.ArrayList; +import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -21,16 +22,19 @@ public static void main(String[] args) { {'W','.','W','.','.','.'}, }; - Set coordinateSet = new HashSet<>(); - int[] coord1 = new int[]{1, 5}; - int[] coord2 = new int[]{3, 7}; - int[] coord3 = new int[]{1, 5}; + // Set coordinateSet = new HashSet<>(); + // int[] coord1 = new int[]{1, 5}; + // int[] coord2 = new int[]{3, 7}; + // int[] coord3 = new int[]{1, 5}; - coordinateSet.add(coord1); - coordinateSet.add(coord2); - coordinateSet.add(coord3); + // coordinateSet.add(coord1); + // coordinateSet.add(coord2); + // coordinateSet.add(coord3); - System.out.println(coordinateSet.size()); + // System.out.println(coordinateSet.size()); + + Position pos = new Position(3, 5); + System.out.println(pos); } /** @@ -69,6 +73,8 @@ public static boolean canReach(char[][] enclosure, int[] current, boolean[][] vi if (visited[curR][curC]) return false; if (enclosure[curR][curC] == 'f') return true; + System.out.println(Arrays.toString(current)); + visited[curR][curC] = true; List moves = possibleMoves(enclosure, current); From 56d3695a4c936cd6a1a6d1099104d4c303789431 Mon Sep 17 00:00:00 2001 From: Alexander Ruban Date: Thu, 17 Apr 2025 07:46:40 -0700 Subject: [PATCH 5/5] Made return statement easier to see. --- src/SalamanderSearch.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SalamanderSearch.java b/src/SalamanderSearch.java index 4249bf8..f3bc08a 100644 --- a/src/SalamanderSearch.java +++ b/src/SalamanderSearch.java @@ -121,6 +121,8 @@ public static List possibleMoves(char[][] enclosure, int[] current) { } } + return moves; + // // UP // int newR = curR - 1; // int newC = curC; @@ -152,7 +154,5 @@ public static List possibleMoves(char[][] enclosure, int[] current) { // if (newC < enclosure[0].length && enclosure[newR][newC] != 'W') { // moves.add(new int[]{newR, newC}); // } - - return moves; } }