From 7bd59902e2e39a71379a3a7af8d85f69436e49a9 Mon Sep 17 00:00:00 2001 From: Steinar Aalstad Lillesund Date: Mon, 16 Mar 2020 14:33:22 +0100 Subject: [PATCH 1/5] =?UTF-8?q?Referat=20fra=20m=C3=B8te.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/team/referater/referat_16_03_2020.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 docs/team/referater/referat_16_03_2020.md diff --git a/docs/team/referater/referat_16_03_2020.md b/docs/team/referater/referat_16_03_2020.md new file mode 100644 index 0000000..640edbb --- /dev/null +++ b/docs/team/referater/referat_16_03_2020.md @@ -0,0 +1,15 @@ +## Oppmøte +Tilstede: Steinar, Gabriel, Kristian, Torbjørn, Petter +Ikke tilstede: + +## Agenda +- Design valg + +- Brukerhistorier + +- Fordele Oppgaver + +## Møte +- Diskuterte håndtering av framtidinge møter med tanke på korona situasjonen. +- Gikk igjennom prosjekt tavlen og gikk igjennom hver oppgave der. +- Avsluttet møte ved å dele oss opp i par-programmeringsgrupper. \ No newline at end of file From 31bef9fe0b758e308f2c246ef98f715f397e67c2 Mon Sep 17 00:00:00 2001 From: Steinar Aalstad Lillesund Date: Mon, 16 Mar 2020 15:52:18 +0100 Subject: [PATCH 2/5] =?UTF-8?q?Parprogrammering=20med=20tobydrama=20-=20La?= =?UTF-8?q?get=20funksjonalitet=20for=20flagg=20registrering=20Lagt=20inn?= =?UTF-8?q?=20metoder=20og=20hjelpemetoder=20for=20=C3=A5=20f=C3=A5=20til?= =?UTF-8?q?=20registrering=20av=20flagg.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inf112/fiasko/roborally/objects/Board.java | 13 +++++++++++++ .../roborally/objects/BoardElementContainer.java | 2 +- .../fiasko/roborally/objects/RoboRallyGame.java | 16 ++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/src/main/java/inf112/fiasko/roborally/objects/Board.java b/src/main/java/inf112/fiasko/roborally/objects/Board.java index 5ab22dc..f89c1b1 100644 --- a/src/main/java/inf112/fiasko/roborally/objects/Board.java +++ b/src/main/java/inf112/fiasko/roborally/objects/Board.java @@ -178,6 +178,19 @@ public class Board { return robots.containsKey(robot); } + /** + * Updates the flag of the robot if it stands on the correct flag. + * @param robotID The RobotID of a robot + * @param flagID TileType of the flag we check + */ + public void updateFlagOnRobot(RobotID robotID, TileType flagID) { + Robot robot = robots.get(robotID); + int flagNr = flagID.getTileTypeID() % 16; + if (flagNr - 1 == robot.getLastFlagVisited()) { + robot.setLastFlagVisitedAndUpdateBackupPosition(flagNr); + } + } + /** * Checks if a potential robot move would be blocked by a wall * @param robotPosition The current position of the robot diff --git a/src/main/java/inf112/fiasko/roborally/objects/BoardElementContainer.java b/src/main/java/inf112/fiasko/roborally/objects/BoardElementContainer.java index e120140..7b253c7 100644 --- a/src/main/java/inf112/fiasko/roborally/objects/BoardElementContainer.java +++ b/src/main/java/inf112/fiasko/roborally/objects/BoardElementContainer.java @@ -8,7 +8,7 @@ import inf112.fiasko.roborally.element_properties.Position; */ public class BoardElementContainer { K obj; - Position pos; + private Position pos; /** * Initializes the BoardElementContainer diff --git a/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java b/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java index 74ae131..21e0eb5 100644 --- a/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java +++ b/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java @@ -5,6 +5,7 @@ import inf112.fiasko.roborally.element_properties.Position; import inf112.fiasko.roborally.element_properties.RobotID; import inf112.fiasko.roborally.element_properties.TileType; import inf112.fiasko.roborally.utility.BoardLoaderUtil; +import javafx.geometry.Pos; import java.io.IOException; import java.util.ArrayList; @@ -204,4 +205,19 @@ public class RoboRallyGame implements IDrawableGame { } } } + + /** + * Checks all flags for robots. Tries to update the flag of the robot. + */ + private void checkAllFlags() { + List> listOfFlags = gameBoard.getPositionsOfTileOnBoard(TileType.FLAG_1, + TileType.FLAG_2, TileType.FLAG_3, TileType.FLAG_4); + for (BoardElementContainer flag:listOfFlags) { + Position flagPosition = flag.getPosition(); + if (gameBoard.hasRobotOnPosition(flagPosition)) { + RobotID robot = gameBoard.getRobotOnPosition(flagPosition); + gameBoard.updateFlagOnRobot(robot, flag.getObject().getTileType()); + } + } + } } \ No newline at end of file From c43798dfab78a314ee5b4f8c2d120a50c8621868 Mon Sep 17 00:00:00 2001 From: Steinar Aalstad Lillesund Date: Mon, 16 Mar 2020 15:52:50 +0100 Subject: [PATCH 3/5] Parprogrammering med tobydrama - Laget Tester for registrering av flagg. --- .../fiasko/roborally/objects/BoardTest.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/test/java/inf112/fiasko/roborally/objects/BoardTest.java b/src/test/java/inf112/fiasko/roborally/objects/BoardTest.java index d80bd61..f7ce301 100644 --- a/src/test/java/inf112/fiasko/roborally/objects/BoardTest.java +++ b/src/test/java/inf112/fiasko/roborally/objects/BoardTest.java @@ -61,7 +61,26 @@ public class BoardTest { wallGrid.setElement(2, 1, new Wall(WallType.WALL_NORMAL, Direction.SOUTH)); wallGrid.setElement(2, 2, new Wall(WallType.WALL_NORMAL, Direction.EAST)); wallGrid.setElement(1, 2, new Wall(WallType.WALL_CORNER, Direction.NORTH_EAST)); + tileGrid.setElement(3,3, new Tile(TileType.FLAG_1, Direction.NORTH)); + tileGrid.setElement(2,2, new Tile(TileType.FLAG_2, Direction.NORTH)); board = new Board(tileGrid, wallGrid, robotList); + + } + + @Test + public void flagGetsUpdatedOnRobotWithCorrectLastVisitedFlag() { + Robot testRobot = robotList.get(6); + assertEquals(0,testRobot.getLastFlagVisited()); + board.updateFlagOnRobot(RobotID.ROBOT_7, TileType.FLAG_1); + assertEquals(1,testRobot.getLastFlagVisited()); + } + + @Test + public void flagDoesNotUpdatedOnRobotWithWringLastVisitedFlag() { + Robot testRobot = robotList.get(6); + assertEquals(0,testRobot.getLastFlagVisited()); + board.updateFlagOnRobot(RobotID.ROBOT_7, TileType.FLAG_2); + assertEquals(0,testRobot.getLastFlagVisited()); } @Test From f01576d34e4ba3426f8bfc1379000b63a1440ce4 Mon Sep 17 00:00:00 2001 From: GabrielMagnus Date: Mon, 16 Mar 2020 16:45:45 +0100 Subject: [PATCH 4/5] Laget tester for getPositionsOfWallOnBoard og getPositionsOfTileOnBoard --- .../fiasko/roborally/objects/BoardTest.java | 99 +++++++++++++++++++ 1 file changed, 99 insertions(+) diff --git a/src/test/java/inf112/fiasko/roborally/objects/BoardTest.java b/src/test/java/inf112/fiasko/roborally/objects/BoardTest.java index d80bd61..7d0d4bc 100644 --- a/src/test/java/inf112/fiasko/roborally/objects/BoardTest.java +++ b/src/test/java/inf112/fiasko/roborally/objects/BoardTest.java @@ -10,7 +10,10 @@ import org.junit.BeforeClass; import org.junit.Test; import java.util.ArrayList; +import java.util.Map; +import java.util.HashMap; import java.util.List; +import java.util.function.Predicate; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -31,6 +34,9 @@ public class BoardTest { private static Position someValidPosition8; private List robotList; private Board board; + private Board boardWithDifferentAmountOfAllTypes; + private Map wallTypeNumberMap = new HashMap<>(); + private Map tileTypeNumberMap = new HashMap<>(); @BeforeClass public static void globalSetUp() { @@ -62,6 +68,31 @@ public class BoardTest { wallGrid.setElement(2, 2, new Wall(WallType.WALL_NORMAL, Direction.EAST)); wallGrid.setElement(1, 2, new Wall(WallType.WALL_CORNER, Direction.NORTH_EAST)); board = new Board(tileGrid, wallGrid, robotList); + + Grid tileGridAllTypes = new Grid<>(6,6); + Grid wallGridAllTypes = new Grid<>(6,6); + List emptyRobotList = new ArrayList<>(); + wallGridAllTypes.setElement(1, 1, new Wall(WallType.WALL_NORMAL, Direction.SOUTH)); + wallGridAllTypes.setElement(1, 2, new Wall(WallType.WALL_NORMAL, Direction.SOUTH)); + wallGridAllTypes.setElement(1, 3, new Wall(WallType.WALL_NORMAL, Direction.SOUTH)); + wallGridAllTypes.setElement(2, 1, new Wall(WallType.WALL_CORNER, Direction.EAST)); + wallGridAllTypes.setElement(2, 2, new Wall(WallType.WALL_CORNER, Direction.EAST)); + tileGridAllTypes.setElement(1, 1, new Tile(TileType.COGWHEEL_LEFT, Direction.NORTH)); + tileGridAllTypes.setElement(3, 1, new Tile(TileType.COGWHEEL_RIGHT, Direction.NORTH)); + tileGridAllTypes.setElement(3, 2, new Tile(TileType.COGWHEEL_RIGHT, Direction.NORTH)); + tileGridAllTypes.setElement(3, 3, new Tile(TileType.COGWHEEL_RIGHT, Direction.NORTH)); + tileGridAllTypes.setElement(3, 4, new Tile(TileType.COGWHEEL_RIGHT, Direction.NORTH)); + tileGridAllTypes.setElement(2, 1, new Tile(TileType.TILE, Direction.WEST)); + tileGridAllTypes.setElement(2, 2, new Tile(TileType.TILE, Direction.WEST)); + tileGridAllTypes.setElement(2, 3, new Tile(TileType.TILE, Direction.WEST)); + tileGridAllTypes.setElement(2, 4, new Tile(TileType.TILE, Direction.WEST)); + tileGridAllTypes.setElement(2, 5, new Tile(TileType.TILE, Direction.WEST)); + wallTypeNumberMap.put(WallType.WALL_NORMAL, 3); + wallTypeNumberMap.put(WallType.WALL_CORNER, 2); + tileTypeNumberMap.put(TileType.COGWHEEL_RIGHT, 4); + tileTypeNumberMap.put(TileType.COGWHEEL_LEFT, 1); + tileTypeNumberMap.put(TileType.TILE, 5); + boardWithDifferentAmountOfAllTypes = new Board(tileGridAllTypes,wallGridAllTypes,emptyRobotList); } @Test @@ -161,4 +192,72 @@ public class BoardTest { board.respawnRobots(); assertFalse(board.isRobotAlive(robot.getRobotId())); } + + @Test + public void getPositionsOfTileOnBoardGivesCorrectAmountOfCogwheelLeftTiles() { + assertEquals((int)tileTypeNumberMap.get(TileType.COGWHEEL_LEFT), + boardWithDifferentAmountOfAllTypes.getPositionsOfTileOnBoard(TileType.COGWHEEL_LEFT).size()); + } + + @Test + public void getPositionsOfTileOnBoardHasTypeCogwheelLeft() { + List> boardElemList = boardWithDifferentAmountOfAllTypes.getPositionsOfTileOnBoard(TileType.COGWHEEL_LEFT); + + for (BoardElementContainer elem : boardElemList) { + assertEquals(elem.getObject().getTileType(), TileType.COGWHEEL_LEFT); + } + } + + @Test + public void getPositionsOfTileOnBoardGivesCorrectAmountOfTileTiles() { + assertEquals((int)tileTypeNumberMap.get(TileType.TILE), + boardWithDifferentAmountOfAllTypes.getPositionsOfTileOnBoard(TileType.TILE).size()); + } + + @Test + public void getPositionsOfTileOnBoardHasTypeTile() { + List> boardElemList = boardWithDifferentAmountOfAllTypes.getPositionsOfTileOnBoard(TileType.TILE); + + for (BoardElementContainer elem : boardElemList) { + assertEquals(elem.getObject().getTileType(), TileType.TILE); + } + } + + @Test + public void getPositionsOfWallOnBoardGivesCorrectAmountOfWallNormalWalls() { + assertEquals((int)wallTypeNumberMap.get(WallType.WALL_NORMAL), + boardWithDifferentAmountOfAllTypes.getPositionsOfWallOnBoard(WallType.WALL_NORMAL).size()); + } + + @Test + public void getPositionsOfWallOnBoardHasTypeWallNormal() { + List> boardElemList = boardWithDifferentAmountOfAllTypes.getPositionsOfWallOnBoard(WallType.WALL_NORMAL); + + for (BoardElementContainer elem : boardElemList) { + assertEquals(elem.getObject().getWallType(), WallType.WALL_NORMAL); + } + } + + @Test + public void getPositionsOfWallOnBoardGivesCorrectAmountOfWallCornerWalls() { + assertEquals((int)wallTypeNumberMap.get(WallType.WALL_CORNER), + boardWithDifferentAmountOfAllTypes.getPositionsOfWallOnBoard(WallType.WALL_CORNER).size()); + } + + @Test + public void getPositionsOfWallOnBoardHasTypeWallCorner() { + List> boardElemList = boardWithDifferentAmountOfAllTypes.getPositionsOfWallOnBoard(WallType.WALL_CORNER); + + for (BoardElementContainer elem : boardElemList) { + assertEquals(elem.getObject().getWallType(), WallType.WALL_CORNER); + } + } + + @Test + public void getPositionsOfWallOnBoardHasCorrect() { + List> boardElemList = boardWithDifferentAmountOfAllTypes.getPositionsOfWallOnBoard(WallType.WALL_CORNER); + Predicate> pred = (element) -> element.getObject().getWallType() == WallType.WALL_CORNER; + boardElemList.removeIf(pred); + assertEquals(0, boardElemList.size()); + } } From 14dfbea630efa5d9376b509a4d198b078505ba4e Mon Sep 17 00:00:00 2001 From: GabrielMagnus Date: Mon, 16 Mar 2020 16:46:22 +0100 Subject: [PATCH 5/5] Endret metodenavn for mer lesbarhet --- .../fiasko/roborally/objects/Board.java | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/main/java/inf112/fiasko/roborally/objects/Board.java b/src/main/java/inf112/fiasko/roborally/objects/Board.java index 5ab22dc..b28eac4 100644 --- a/src/main/java/inf112/fiasko/roborally/objects/Board.java +++ b/src/main/java/inf112/fiasko/roborally/objects/Board.java @@ -345,7 +345,7 @@ public class Board { * @param walls The walls you want all positions for * @return A list of BoardElementContainers */ - public List> getPositionsOfTileOnBoard(WallType ... walls) { + public List> getPositionsOfWallOnBoard(WallType ... walls) { List> combinedList = new ArrayList<>(); for (WallType wall : walls) { combinedList.addAll(makeTileList(wall, this.walls)); @@ -367,18 +367,20 @@ public class Board { for (int y = grid.getHeight() - 1; y >= 0; y--) { for (int x = 0; x < grid.getWidth(); x++) { T gridElement = grid.getElement(x, y); - if (gridElement.getClass().isAssignableFrom(Tile.class)) { - Tile tile = (Tile) gridElement; - if (tile.getTileType() == type) { - objList.add(new BoardElementContainer<>(gridElement, new Position(x,y))); + if (gridElement != null) { + if (gridElement.getClass().isAssignableFrom(Tile.class)) { + Tile tile = (Tile) gridElement; + if (tile.getTileType() == type) { + objList.add(new BoardElementContainer<>(gridElement, new Position(x,y))); + } + } else if (gridElement.getClass().isAssignableFrom(Wall.class)) { + Wall wall = (Wall) gridElement; + if (wall.getWallType() == type) { + objList.add(new BoardElementContainer<>(gridElement, new Position(x,y))); + } + } else { + throw new IllegalArgumentException("Grid has unknown type."); } - } else if (gridElement.getClass().isAssignableFrom(Wall.class)) { - Wall wall = (Wall) gridElement; - if (wall.getWallType() == type) { - objList.add(new BoardElementContainer<>(gridElement, new Position(x,y))); - } - } else { - throw new IllegalArgumentException("Grid has unknown type."); } } }