From 74a7fafe754efe25e205d5847234520f0a127b0d Mon Sep 17 00:00:00 2001 From: dannymccarragher Date: Mon, 7 Apr 2025 22:26:43 -0700 Subject: [PATCH 1/2] Completed livecode from 4/4 --- src/SalamanderSearch.java | 83 ++++++- src/SalamanderSearchTest.java | 395 +++++++++++++++++----------------- 2 files changed, 280 insertions(+), 198 deletions(-) diff --git a/src/SalamanderSearch.java b/src/SalamanderSearch.java index 688cda7..f51a1ef 100644 --- a/src/SalamanderSearch.java +++ b/src/SalamanderSearch.java @@ -43,6 +43,87 @@ public static void main(String[] args) { * @return whether the salamander can reach the food */ public static boolean canReach(char[][] enclosure) { - return false; + 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]; + + //base case + 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 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; + } + + public static int[] salamanderLocation(char[][] enclosure){ + for(int row = 0; row < enclosure.length; row++){ + for(int col = 0; col < enclosure[row].length; col++ ){ + if(enclosure[row][col] == 's'){ + return new int[] {row, col}; + } + } + } + + throw new IllegalArgumentException("No salamander present"); + } } diff --git a/src/SalamanderSearchTest.java b/src/SalamanderSearchTest.java index ddad9de..fbda470 100644 --- a/src/SalamanderSearchTest.java +++ b/src/SalamanderSearchTest.java @@ -19,6 +19,7 @@ public void canReach_PathExists() { }; boolean actual = SalamanderSearch.canReach(enclosure); assertTrue(actual); + } @Test @@ -34,203 +35,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 e8664dfb3fb82ce84905642c5e400ee76faafbd7 Mon Sep 17 00:00:00 2001 From: dannymccarragher Date: Tue, 8 Apr 2025 14:25:46 -0700 Subject: [PATCH 2/2] Refactored possibleMoves method --- src/SalamanderSearch.java | 85 ++++++++++++++++++++++++++------------- 1 file changed, 58 insertions(+), 27 deletions(-) diff --git a/src/SalamanderSearch.java b/src/SalamanderSearch.java index f51a1ef..a1db7ad 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,19 @@ public static void main(String[] args) { {'f','W','.','.','W','.'}, {'W','.','W','.','.','.'}, }; + + Set coordinates = new HashSet<>(); + + int[] coord1 = new int[] {1,5}; + int[] coord2 = new int[] {3,7}; + int[] coord3 = new int[] {1,5}; + + + coordinates.add(coord1); + coordinates.add(coord2); + // coordinates.add(coord3); + System.out.println(coordinates.size()); + System.out.println(coordinates.contains(coord3)); } /** @@ -69,7 +84,7 @@ public static boolean canReach(char[][] enclosure, int[] current, boolean[][]vis for(int[] move : moves){ if(canReach(enclosure, move, visited)){ return true; - }; + } } return false; @@ -81,35 +96,51 @@ public static List possibleMoves(char[][] enclosure, int[] current){ 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}); - } + int[][] directions = new int[][] { + {-1, 0}, + {1, 0}, + {0, -1}, + {0, 1} + }; - //Right - newR = curR; - newC = curC + 1; + for(int[] direction : directions){ + int newR = curR + direction[0]; + int newC = curC + direction[1]; - if(newC < enclosure[0].length && 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}); + } } + // //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; }