From 11f57db3c404c37d5ab3e0f9665b31e3049994f7 Mon Sep 17 00:00:00 2001 From: Szymon Rybski Date: Sun, 15 Dec 2024 18:20:13 +0100 Subject: [PATCH 1/7] finished part 1 --- .../main/java/agh/ics/oop/OptionsParser.java | 32 +++++++++++---- oolab/src/main/java/agh/ics/oop/World.java | 4 ++ .../agh/ics/oop/model/AbstractWorldMap.java | 16 +++++--- .../java/agh/ics/oop/model/GrassField.java | 35 +++-------------- .../agh/ics/oop/model/MapChangeListener.java | 1 + .../main/java/agh/ics/oop/model/WorldMap.java | 5 ++- .../agh/ics/oop/model/util/MapVisualizer.java | 9 +++-- .../agh/ics/oop/model/GrassFieldTest.java | 8 ++-- .../agh/ics/oop/model/RectangularMapTest.java | 39 +++++++++++++++++-- 9 files changed, 95 insertions(+), 54 deletions(-) diff --git a/oolab/src/main/java/agh/ics/oop/OptionsParser.java b/oolab/src/main/java/agh/ics/oop/OptionsParser.java index c0d7fb7..915365d 100644 --- a/oolab/src/main/java/agh/ics/oop/OptionsParser.java +++ b/oolab/src/main/java/agh/ics/oop/OptionsParser.java @@ -2,8 +2,8 @@ import agh.ics.oop.model.MoveDirection; -import java.util.ArrayList; import java.util.List; +import java.util.stream.Stream; public class OptionsParser { @@ -29,19 +29,37 @@ public static List parseOptions(String[] options) { // }; // current_index++; // } - List moves = new ArrayList<>(); - for (String option : options) { + Stream optionsStream = Stream.of(options); + + var result = optionsStream.map(option -> { if (!(option.equals("f") || option.equals("b") || option.equals("l") || option.equals("r"))) { throw new IllegalArgumentException(option + " is not legal move specification"); } - moves.add(switch (option) { + return switch (option) { case "f" -> MoveDirection.FORWARD; case "b" -> MoveDirection.BACKWARD; case "l" -> MoveDirection.LEFT; case "r" -> MoveDirection.RIGHT; default -> null; - }); - } - return moves; + } + ; + }).toList(); + + return result; + +// List moves = new ArrayList<>(); +// for (String option : options) { +// if (!(option.equals("f") || option.equals("b") || option.equals("l") || option.equals("r"))) { +// throw new IllegalArgumentException(option + " is not legal move specification"); +// } +// moves.add(switch (option) { +// case "f" -> MoveDirection.FORWARD; +// case "b" -> MoveDirection.BACKWARD; +// case "l" -> MoveDirection.LEFT; +// case "r" -> MoveDirection.RIGHT; +// default -> null; +// }); +// } +// return moves; } } diff --git a/oolab/src/main/java/agh/ics/oop/World.java b/oolab/src/main/java/agh/ics/oop/World.java index f6e71e5..668bf52 100644 --- a/oolab/src/main/java/agh/ics/oop/World.java +++ b/oolab/src/main/java/agh/ics/oop/World.java @@ -6,6 +6,7 @@ import agh.ics.oop.model.Vector2d; import agh.ics.oop.model.util.ConsoleMapDisplay; +import java.time.LocalDateTime; import java.util.List; public class World { @@ -17,6 +18,9 @@ public static void main(String[] args) { var rectangularMap = new RectangularMap(10, 10, 1); var observer = new ConsoleMapDisplay(); grassField.addObserver(observer); + grassField.addObserver((worldMap, message) -> { + System.out.println(String.format("%s %s", LocalDateTime.now(), message)); + }); rectangularMap.addObserver(observer); var simulation = new Simulation(positions, moves, grassField); var simulation2 = new Simulation(positions, moves, rectangularMap); diff --git a/oolab/src/main/java/agh/ics/oop/model/AbstractWorldMap.java b/oolab/src/main/java/agh/ics/oop/model/AbstractWorldMap.java index 1b77a94..dd966c4 100644 --- a/oolab/src/main/java/agh/ics/oop/model/AbstractWorldMap.java +++ b/oolab/src/main/java/agh/ics/oop/model/AbstractWorldMap.java @@ -4,9 +4,7 @@ import agh.ics.oop.model.util.IncorrectPositionException; import agh.ics.oop.model.util.MapVisualizer; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; +import java.util.*; public abstract class AbstractWorldMap implements WorldMap { protected final MapVisualizer visualizer; @@ -69,13 +67,13 @@ public void place(Animal animal) throws IncorrectPositionException { } @Override - public WorldElement objectAt(Vector2d position) { - return animals.get(position); + public Optional objectAt(Vector2d position) { + return Optional.ofNullable(animals.get(position)); } @Override public boolean isOccupied(Vector2d position) { - return objectAt(position) != null; + return objectAt(position).isPresent(); } @Override @@ -105,4 +103,10 @@ public String toString() { public int getId() { return mapId; } + + @Override + public List getOrderedAnimals() { + return animals.values().stream().sorted(Comparator.comparing((Animal animal) -> animal.getPosition().getX() + ).thenComparing((Animal animal) -> animal.getPosition().getY())).toList(); + } } diff --git a/oolab/src/main/java/agh/ics/oop/model/GrassField.java b/oolab/src/main/java/agh/ics/oop/model/GrassField.java index 17bdd9d..eb9d2f3 100644 --- a/oolab/src/main/java/agh/ics/oop/model/GrassField.java +++ b/oolab/src/main/java/agh/ics/oop/model/GrassField.java @@ -5,6 +5,8 @@ import java.util.HashMap; import java.util.List; +import java.util.Optional; +import java.util.stream.Stream; public class GrassField extends AbstractWorldMap { private final HashMap grasses; @@ -17,20 +19,6 @@ public GrassField(int grassCount, int mapId) { var upperBound = (int) Math.sqrt(grassCount * 10); lowerVisualisationBoundary = new Vector2d(upperBound, upperBound); upperVisualisationBoundary = new Vector2d(0, 0); -//obsolete code - will be removed after pr 5, kept as fallback in case Random position generator is broken -// for (var i = 0; i < grassCount; ++i) { -// -// var possiblePosition = new Vector2d((int) (Math.random() * upperBound), (int) (Math.random() * upperBound)); -// -// while (grass.get(possiblePosition) != null) { -// possiblePosition = new Vector2d((int) (Math.random() * upperBound), (int) (Math.random() * upperBound)); -// } -// -// upperVisualisationBoundary = upperVisualisationBoundary.upperRight(possiblePosition); -// lowerVisualisationBoundary = lowerVisualisationBoundary.lowerLeft(possiblePosition); -// -// grass.put(possiblePosition, new Grass(possiblePosition)); -// } RandomPositionGenerator randomPositionGenerator = new RandomPositionGenerator(upperBound, upperBound, grassCount); for (Vector2d grassPosition : randomPositionGenerator) { grasses.put(grassPosition, new Grass(grassPosition)); @@ -43,22 +31,18 @@ public GrassField(int grassCount, int mapId) { @Override - public WorldElement objectAt(Vector2d position) { + public Optional objectAt(Vector2d position) { var animalAt = super.objectAt(position); - if (animalAt != null) { + if (animalAt.isPresent()) { return animalAt; } - return grasses.get(position); + return Optional.ofNullable(grasses.get(position)); } @Override public List getElements() { - var temporaryAnimals = super.getElements(); - - temporaryAnimals.addAll(grasses.values()); - - return temporaryAnimals; + return Stream.concat(super.getElements().stream(), grasses.values().stream()).toList(); } @Override @@ -72,12 +56,5 @@ public Boundary getCurrentBounds() { return new Boundary(drawingLowerBoundary, drawingUpperBoundary); } - //Methods used for testing - protected Vector2d getUpperVisualisationBoundary() { - return upperVisualisationBoundary; - } - protected Vector2d getLowerVisualisationBoundary() { - return lowerVisualisationBoundary; - } } diff --git a/oolab/src/main/java/agh/ics/oop/model/MapChangeListener.java b/oolab/src/main/java/agh/ics/oop/model/MapChangeListener.java index 5ad2ee2..90eda16 100644 --- a/oolab/src/main/java/agh/ics/oop/model/MapChangeListener.java +++ b/oolab/src/main/java/agh/ics/oop/model/MapChangeListener.java @@ -1,5 +1,6 @@ package agh.ics.oop.model; +@FunctionalInterface public interface MapChangeListener { void mapChanged(WorldMap worldMap, String message); } diff --git a/oolab/src/main/java/agh/ics/oop/model/WorldMap.java b/oolab/src/main/java/agh/ics/oop/model/WorldMap.java index 93a4b2d..a464e92 100644 --- a/oolab/src/main/java/agh/ics/oop/model/WorldMap.java +++ b/oolab/src/main/java/agh/ics/oop/model/WorldMap.java @@ -4,6 +4,7 @@ import agh.ics.oop.model.util.IncorrectPositionException; import java.util.List; +import java.util.Optional; /** * The interface responsible for interacting with the map of the world. @@ -42,7 +43,7 @@ public interface WorldMap extends agh.ics.oop.model.MoveValidator { * @param position The position of the animal. * @return animal or null if the position is not occupied. */ - WorldElement objectAt(Vector2d position); + Optional objectAt(Vector2d position); boolean canMoveTo(Vector2d position); @@ -51,4 +52,6 @@ public interface WorldMap extends agh.ics.oop.model.MoveValidator { Boundary getCurrentBounds(); int getId(); + + List getOrderedAnimals(); } diff --git a/oolab/src/main/java/agh/ics/oop/model/util/MapVisualizer.java b/oolab/src/main/java/agh/ics/oop/model/util/MapVisualizer.java index c10b2d7..ed17510 100644 --- a/oolab/src/main/java/agh/ics/oop/model/util/MapVisualizer.java +++ b/oolab/src/main/java/agh/ics/oop/model/util/MapVisualizer.java @@ -1,8 +1,11 @@ package agh.ics.oop.model.util; import agh.ics.oop.model.Vector2d; +import agh.ics.oop.model.WorldElement; import agh.ics.oop.model.WorldMap; +import java.util.Optional; + /** * The map visualizer converts the {@link WorldMap} map into a string * representation. @@ -75,9 +78,9 @@ private String drawHeader(Vector2d lowerLeft, Vector2d upperRight) { private String drawObject(Vector2d currentPosition) { if (this.map.isOccupied(currentPosition)) { - Object object = this.map.objectAt(currentPosition); - if (object != null) { - return object.toString(); + Optional object = this.map.objectAt(currentPosition); + if (object.isPresent()) { + return object.get().toString(); } } return EMPTY_CELL; diff --git a/oolab/src/test/java/agh/ics/oop/model/GrassFieldTest.java b/oolab/src/test/java/agh/ics/oop/model/GrassFieldTest.java index af9510e..2286005 100644 --- a/oolab/src/test/java/agh/ics/oop/model/GrassFieldTest.java +++ b/oolab/src/test/java/agh/ics/oop/model/GrassFieldTest.java @@ -21,7 +21,7 @@ void animalIsPlacedOnValidCoordinates() { try { testMap.place(testAnimal); - Assertions.assertEquals(testAnimal, testMap.objectAt(properPosition)); + Assertions.assertEquals(testAnimal, testMap.objectAt(properPosition).get()); } catch (IncorrectPositionException ex) { Assertions.fail("Exception was thrown"); } @@ -58,7 +58,7 @@ void animalMovesIfPositionValid() { var expectedPosition = new Vector2d(1, 2); - Assertions.assertEquals(testAnimal, testMap.objectAt(expectedPosition)); + Assertions.assertEquals(testAnimal, testMap.objectAt(expectedPosition).get()); } catch (IncorrectPositionException ex) { Assertions.fail("Exception was thrown" + ex.getMessage()); } @@ -76,7 +76,7 @@ void animalWontMoveIfPositionInvalid() { testMap.place(testAnimal); testMap.place(blockingAnimal); testMap.move(testAnimal, MoveDirection.BACKWARD); - Assertions.assertEquals(testAnimal, testMap.objectAt(testPosition)); + Assertions.assertEquals(testAnimal, testMap.objectAt(testPosition).get()); } catch (IncorrectPositionException e) { Assertions.fail("Exception was thrown" + e.getMessage()); } @@ -118,7 +118,7 @@ void objectThatIsOnPositionIsReturned() { Assertions.fail("Exception was thrown" + e.getMessage()); } - Assertions.assertEquals(testAnimal, testMap.objectAt(occupiedPosition)); + Assertions.assertEquals(testAnimal, testMap.objectAt(occupiedPosition).get()); } @Test diff --git a/oolab/src/test/java/agh/ics/oop/model/RectangularMapTest.java b/oolab/src/test/java/agh/ics/oop/model/RectangularMapTest.java index 72a117b..8b00dba 100644 --- a/oolab/src/test/java/agh/ics/oop/model/RectangularMapTest.java +++ b/oolab/src/test/java/agh/ics/oop/model/RectangularMapTest.java @@ -4,6 +4,8 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import java.util.List; + public class RectangularMapTest { @Test @@ -14,7 +16,7 @@ void animalIsPlacedOnValidCoordinates() { try { testMap.place(testAnimal); - Assertions.assertEquals(testAnimal, testMap.objectAt(properPosition)); + Assertions.assertEquals(testAnimal, testMap.objectAt(properPosition).get()); } catch (IncorrectPositionException e) { Assertions.fail("Exception was thrown" + e.getMessage()); } @@ -66,7 +68,7 @@ void animalMovesIfPositionValid() { var expectedPosition = new Vector2d(1, 2); Assertions.assertFalse(testMap.isOccupied(testPosition)); - Assertions.assertEquals(testAnimal, testMap.objectAt(expectedPosition)); + Assertions.assertEquals(testAnimal, testMap.objectAt(expectedPosition).get()); } @Test @@ -83,7 +85,7 @@ void animalWontMoveIfPositionInvalid() { testMap.move(testAnimal, MoveDirection.BACKWARD); Assertions.assertTrue(testMap.isOccupied(testPosition)); - Assertions.assertEquals(testAnimal, testMap.objectAt(testPosition)); + Assertions.assertEquals(testAnimal, testMap.objectAt(testPosition).get()); } @Test @@ -129,7 +131,7 @@ void objectThatIsOnPositionIsReturned() { Assertions.fail("Exception was thrown" + e.getMessage()); } - Assertions.assertEquals(testAnimal, testMap.objectAt(occupiedPosition)); + Assertions.assertEquals(testAnimal, testMap.objectAt(occupiedPosition).get()); } @Test @@ -179,4 +181,33 @@ void rectangularMapReturnsProperAmountOfElements() { } } + @Test + void animalsAreSortedByX() { + RectangularMap testMap = new RectangularMap(10, 10, 0); + Animal animal1 = new Animal(new Vector2d(0, 1)); + Animal animal2 = new Animal(new Vector2d(1, 1)); + List expectedAnimals = List.of(animal1, animal2); + try { + testMap.place(animal1); + testMap.place(animal2); + Assertions.assertEquals(expectedAnimals, testMap.getOrderedAnimals()); + } catch (IncorrectPositionException e) { + Assertions.fail("Exception was thrown" + e.getMessage()); + } + } + + @Test + void animalsAreSortedByY() { + RectangularMap testMap = new RectangularMap(10, 10, 0); + Animal animal1 = new Animal(new Vector2d(1, 0)); + Animal animal2 = new Animal(new Vector2d(1, 1)); + List expectedAnimals = List.of(animal1, animal2); + try { + testMap.place(animal1); + testMap.place(animal2); + Assertions.assertEquals(expectedAnimals, testMap.getOrderedAnimals()); + } catch (IncorrectPositionException e) { + Assertions.fail("Exception was thrown" + e.getMessage()); + } + } } From cb3b90dfc775d457b5aaf7bd271a4fe3a761dea1 Mon Sep 17 00:00:00 2001 From: Szymon Rybski Date: Sun, 15 Dec 2024 22:48:51 +0100 Subject: [PATCH 2/7] part 2 finished - improvements required --- oolab/map_0.log | 228 ++++++++++++++++++ oolab/src/main/java/agh/ics/oop/World.java | 3 + .../main/java/agh/ics/oop/model/Animal.java | 10 + .../main/java/agh/ics/oop/model/Grass.java | 5 + .../java/agh/ics/oop/model/WorldElement.java | 2 + .../ics/oop/model/util/FileMapDisplay.java | 27 +++ .../oop/presenter/MainWindowPresenter.java | 2 +- .../oop/presenter/SimulationPresenter.java | 29 ++- .../ics/oop/presenter/WorldElementBox.java | 71 ++++++ oolab/src/main/resources/down.png | Bin 0 -> 7891 bytes oolab/src/main/resources/grass.png | Bin 0 -> 8469 bytes oolab/src/main/resources/left.png | Bin 0 -> 8190 bytes oolab/src/main/resources/right.png | Bin 0 -> 8123 bytes oolab/src/main/resources/up.png | Bin 0 -> 7760 bytes 14 files changed, 367 insertions(+), 10 deletions(-) create mode 100644 oolab/map_0.log create mode 100644 oolab/src/main/java/agh/ics/oop/model/util/FileMapDisplay.java create mode 100644 oolab/src/main/java/agh/ics/oop/presenter/WorldElementBox.java create mode 100644 oolab/src/main/resources/down.png create mode 100644 oolab/src/main/resources/grass.png create mode 100644 oolab/src/main/resources/left.png create mode 100644 oolab/src/main/resources/right.png create mode 100644 oolab/src/main/resources/up.png diff --git a/oolab/map_0.log b/oolab/map_0.log new file mode 100644 index 0000000..7b8bfaa --- /dev/null +++ b/oolab/map_0.log @@ -0,0 +1,228 @@ +Move information: +Animal was placed at (1,1) + +Current map state: + + y\x 0 1 2 3 4 5 6 7 8 9 + 9: --------------------- + 8: | | | | | | | | | |*| + 7: | | | |*| | | |*| | | + 6: | | | | |*| | | | | | + 5: | | | | | | | |*| | | + 4: | | | |*| | | | | | | + 3: | | |*| | | | | | | | + 2: | |*| | | | | | | | | + 1: | |^| | | | | | | | | + 0: |*| | | | | | | | |*| + -1: --------------------- + +----------------- +Move information: +Animal moved from (1,1) to (1,2) + +Current map state: + + y\x 0 1 2 3 4 5 6 7 8 9 + 9: --------------------- + 8: | | | | | | | | | |*| + 7: | | | |*| | | |*| | | + 6: | | | | |*| | | | | | + 5: | | | | | | | |*| | | + 4: | | | |*| | | | | | | + 3: | | |*| | | | | | | | + 2: | |^| | | | | | | | | + 1: | | | | | | | | | | | + 0: |*| | | | | | | | |*| + -1: --------------------- + +----------------- +Move information: +Animal moved from (1,2) to (1,1) + +Current map state: + + y\x 0 1 2 3 4 5 6 7 8 9 + 9: --------------------- + 8: | | | | | | | | | |*| + 7: | | | |*| | | |*| | | + 6: | | | | |*| | | | | | + 5: | | | | | | | |*| | | + 4: | | | |*| | | | | | | + 3: | | |*| | | | | | | | + 2: | |*| | | | | | | | | + 1: | |^| | | | | | | | | + 0: |*| | | | | | | | |*| + -1: --------------------- + +----------------- +Move information: +Animal changed direction from Północ to Wschód + +Current map state: + + y\x 0 1 2 3 4 5 6 7 8 9 + 9: --------------------- + 8: | | | | | | | | | |*| + 7: | | | |*| | | |*| | | + 6: | | | | |*| | | | | | + 5: | | | | | | | |*| | | + 4: | | | |*| | | | | | | + 3: | | |*| | | | | | | | + 2: | |*| | | | | | | | | + 1: | |>| | | | | | | | | + 0: |*| | | | | | | | |*| + -1: --------------------- + +----------------- +Move information: +Animal changed direction from Wschód to Północ + +Current map state: + + y\x 0 1 2 3 4 5 6 7 8 9 + 9: --------------------- + 8: | | | | | | | | | |*| + 7: | | | |*| | | |*| | | + 6: | | | | |*| | | | | | + 5: | | | | | | | |*| | | + 4: | | | |*| | | | | | | + 3: | | |*| | | | | | | | + 2: | |*| | | | | | | | | + 1: | |^| | | | | | | | | + 0: |*| | | | | | | | |*| + -1: --------------------- + +----------------- +Move information: +Animal moved from (1,1) to (1,2) + +Current map state: + + y\x 0 1 2 3 4 5 6 7 8 9 + 9: --------------------- + 8: | | | | | | | | | |*| + 7: | | | |*| | | |*| | | + 6: | | | | |*| | | | | | + 5: | | | | | | | |*| | | + 4: | | | |*| | | | | | | + 3: | | |*| | | | | | | | + 2: | |^| | | | | | | | | + 1: | | | | | | | | | | | + 0: |*| | | | | | | | |*| + -1: --------------------- + +----------------- +Move information: +Animal moved from (1,2) to (1,3) + +Current map state: + + y\x 0 1 2 3 4 5 6 7 8 9 + 9: --------------------- + 8: | | | | | | | | | |*| + 7: | | | |*| | | |*| | | + 6: | | | | |*| | | | | | + 5: | | | | | | | |*| | | + 4: | | | |*| | | | | | | + 3: | |^|*| | | | | | | | + 2: | |*| | | | | | | | | + 1: | | | | | | | | | | | + 0: |*| | | | | | | | |*| + -1: --------------------- + +----------------- +Move information: +Animal changed direction from Północ to Wschód + +Current map state: + + y\x 0 1 2 3 4 5 6 7 8 9 + 9: --------------------- + 8: | | | | | | | | | |*| + 7: | | | |*| | | |*| | | + 6: | | | | |*| | | | | | + 5: | | | | | | | |*| | | + 4: | | | |*| | | | | | | + 3: | |>|*| | | | | | | | + 2: | |*| | | | | | | | | + 1: | | | | | | | | | | | + 0: |*| | | | | | | | |*| + -1: --------------------- + +----------------- +Move information: +Animal changed direction from Wschód to Południe + +Current map state: + + y\x 0 1 2 3 4 5 6 7 8 9 + 9: --------------------- + 8: | | | | | | | | | |*| + 7: | | | |*| | | |*| | | + 6: | | | | |*| | | | | | + 5: | | | | | | | |*| | | + 4: | | | |*| | | | | | | + 3: | |v|*| | | | | | | | + 2: | |*| | | | | | | | | + 1: | | | | | | | | | | | + 0: |*| | | | | | | | |*| + -1: --------------------- + +----------------- +Move information: +Animal moved from (1,3) to (1,2) + +Current map state: + + y\x 0 1 2 3 4 5 6 7 8 9 + 9: --------------------- + 8: | | | | | | | | | |*| + 7: | | | |*| | | |*| | | + 6: | | | | |*| | | | | | + 5: | | | | | | | |*| | | + 4: | | | |*| | | | | | | + 3: | | |*| | | | | | | | + 2: | |v| | | | | | | | | + 1: | | | | | | | | | | | + 0: |*| | | | | | | | |*| + -1: --------------------- + +----------------- +Move information: +Animal moved from (1,2) to (1,1) + +Current map state: + + y\x 0 1 2 3 4 5 6 7 8 9 + 9: --------------------- + 8: | | | | | | | | | |*| + 7: | | | |*| | | |*| | | + 6: | | | | |*| | | | | | + 5: | | | | | | | |*| | | + 4: | | | |*| | | | | | | + 3: | | |*| | | | | | | | + 2: | |*| | | | | | | | | + 1: | |v| | | | | | | | | + 0: |*| | | | | | | | |*| + -1: --------------------- + +----------------- +Move information: +Animal moved from (1,1) to (1,0) + +Current map state: + + y\x 0 1 2 3 4 5 6 7 8 9 + 9: --------------------- + 8: | | | | | | | | | |*| + 7: | | | |*| | | |*| | | + 6: | | | | |*| | | | | | + 5: | | | | | | | |*| | | + 4: | | | |*| | | | | | | + 3: | | |*| | | | | | | | + 2: | |*| | | | | | | | | + 1: | | | | | | | | | | | + 0: |*|v| | | | | | | |*| + -1: --------------------- + +----------------- diff --git a/oolab/src/main/java/agh/ics/oop/World.java b/oolab/src/main/java/agh/ics/oop/World.java index 668bf52..70db483 100644 --- a/oolab/src/main/java/agh/ics/oop/World.java +++ b/oolab/src/main/java/agh/ics/oop/World.java @@ -5,6 +5,7 @@ import agh.ics.oop.model.RectangularMap; import agh.ics.oop.model.Vector2d; import agh.ics.oop.model.util.ConsoleMapDisplay; +import agh.ics.oop.model.util.FileMapDisplay; import java.time.LocalDateTime; import java.util.List; @@ -21,6 +22,8 @@ public static void main(String[] args) { grassField.addObserver((worldMap, message) -> { System.out.println(String.format("%s %s", LocalDateTime.now(), message)); }); + FileMapDisplay fileMapDisplay = new FileMapDisplay(); + grassField.addObserver(fileMapDisplay); rectangularMap.addObserver(observer); var simulation = new Simulation(positions, moves, grassField); var simulation2 = new Simulation(positions, moves, rectangularMap); diff --git a/oolab/src/main/java/agh/ics/oop/model/Animal.java b/oolab/src/main/java/agh/ics/oop/model/Animal.java index 5ed3df1..fad9d86 100644 --- a/oolab/src/main/java/agh/ics/oop/model/Animal.java +++ b/oolab/src/main/java/agh/ics/oop/model/Animal.java @@ -71,4 +71,14 @@ public int hashCode() { public Vector2d getPosition() { return localizationOnMap; } + + @Override + public String getResourceString() { + return switch (facingDirection) { + case NORTH -> "up.png"; + case EAST -> "right.png"; + case SOUTH -> "down.png"; + case WEST -> "left.png"; + }; + } } diff --git a/oolab/src/main/java/agh/ics/oop/model/Grass.java b/oolab/src/main/java/agh/ics/oop/model/Grass.java index 30bbfa9..b286f73 100644 --- a/oolab/src/main/java/agh/ics/oop/model/Grass.java +++ b/oolab/src/main/java/agh/ics/oop/model/Grass.java @@ -11,6 +11,11 @@ public Vector2d getPosition() { return position; } + @Override + public String getResourceString() { + return "grass.png"; + } + @Override public String toString() { return "*"; diff --git a/oolab/src/main/java/agh/ics/oop/model/WorldElement.java b/oolab/src/main/java/agh/ics/oop/model/WorldElement.java index 70d47a0..054d9ad 100644 --- a/oolab/src/main/java/agh/ics/oop/model/WorldElement.java +++ b/oolab/src/main/java/agh/ics/oop/model/WorldElement.java @@ -6,4 +6,6 @@ //assumption turns out to be false public interface WorldElement { public Vector2d getPosition(); + + public String getResourceString(); } diff --git a/oolab/src/main/java/agh/ics/oop/model/util/FileMapDisplay.java b/oolab/src/main/java/agh/ics/oop/model/util/FileMapDisplay.java new file mode 100644 index 0000000..11509d6 --- /dev/null +++ b/oolab/src/main/java/agh/ics/oop/model/util/FileMapDisplay.java @@ -0,0 +1,27 @@ +package agh.ics.oop.model.util; + +import agh.ics.oop.model.MapChangeListener; +import agh.ics.oop.model.WorldMap; + +import java.io.File; +import java.io.FileWriter; +import java.io.PrintWriter; + +public class FileMapDisplay implements MapChangeListener { + + @Override + public void mapChanged(WorldMap worldMap, String message) { + File file = new File(String.format("map_%d.log", worldMap.getId())); + try (PrintWriter writer = new PrintWriter(new FileWriter(file, true))) { + writer.println("Move information:"); + writer.println(message); + + writer.println("\nCurrent map state:\n"); + writer.println(worldMap.toString()); + + writer.println("-----------------"); + } catch (Exception e) { + e.printStackTrace(); + } + } +} diff --git a/oolab/src/main/java/agh/ics/oop/presenter/MainWindowPresenter.java b/oolab/src/main/java/agh/ics/oop/presenter/MainWindowPresenter.java index 18edd81..1318825 100644 --- a/oolab/src/main/java/agh/ics/oop/presenter/MainWindowPresenter.java +++ b/oolab/src/main/java/agh/ics/oop/presenter/MainWindowPresenter.java @@ -31,7 +31,7 @@ public class MainWindowPresenter { public void onSimulationStartClicked(ActionEvent actionEvent) throws IOException { - if (moveslisttextfield.getText().strip().length() > 0) { + if (!moveslisttextfield.getText().strip().isEmpty()) { try { List moves = OptionsParser.parseOptions(moveslisttextfield.getText().split(" ")); List positions = List.of(new Vector2d(1, 1)); diff --git a/oolab/src/main/java/agh/ics/oop/presenter/SimulationPresenter.java b/oolab/src/main/java/agh/ics/oop/presenter/SimulationPresenter.java index 3e88ea2..a714367 100644 --- a/oolab/src/main/java/agh/ics/oop/presenter/SimulationPresenter.java +++ b/oolab/src/main/java/agh/ics/oop/presenter/SimulationPresenter.java @@ -1,8 +1,6 @@ package agh.ics.oop.presenter; -import agh.ics.oop.model.AbstractWorldMap; -import agh.ics.oop.model.MapChangeListener; -import agh.ics.oop.model.WorldMap; +import agh.ics.oop.model.*; import javafx.application.Platform; import javafx.fxml.FXML; import javafx.geometry.HPos; @@ -95,12 +93,25 @@ private void setLabelsOy() { } private void addElementsToMap() { - for (var element : worldMap.getElements()) { - if (worldMap.isOccupied(element.getPosition())) { - var label = new Label(element.toString()); - var pos = element.getPosition(); - mapGrid.add(label, pos.getX() - minX + 1, maxY - pos.getY() + 1); - GridPane.setHalignment(label, HPos.CENTER); +// for (var element : worldMap.getElements()) { +// if (worldMap.isOccupied(element.getPosition())) { +// var label = new Label(element.toString()); +// var pos = element.getPosition(); +// mapGrid.add(label, pos.getX() - minX + 1, maxY - pos.getY() + 1); +// GridPane.setHalignment(label, HPos.CENTER); +// } +// } + for (int i = 0; i <= width; ++i) { + for (int j = 0; j <= height; ++j) { + Vector2d positionToCheck = new Vector2d(i + minX, j + minY); + if (worldMap.isOccupied(positionToCheck)) { + WorldElement element = worldMap.objectAt(positionToCheck).get(); + var label = new Label(element.toString()); + System.out.println(label); + //mapGrid.add(label, positionToCheck.getX() - minX + 1, maxY - positionToCheck.getY() + 1); + mapGrid.add(new WorldElementBox(element), i + 1, height - j + 1); + GridPane.setHalignment(label, HPos.CENTER); + } } } } diff --git a/oolab/src/main/java/agh/ics/oop/presenter/WorldElementBox.java b/oolab/src/main/java/agh/ics/oop/presenter/WorldElementBox.java new file mode 100644 index 0000000..c64431e --- /dev/null +++ b/oolab/src/main/java/agh/ics/oop/presenter/WorldElementBox.java @@ -0,0 +1,71 @@ +package agh.ics.oop.presenter; + +import agh.ics.oop.model.Animal; +import agh.ics.oop.model.WorldElement; +import javafx.geometry.Pos; +import javafx.scene.control.Label; +import javafx.scene.image.Image; +import javafx.scene.image.ImageView; +import javafx.scene.layout.VBox; + +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; + +public class WorldElementBox extends VBox { + private static final int IMAGE_HEIGHT = 20; + private static final int IMAGE_WIDTH = 20; + private static final Map images = new HashMap<>(); + + static { + String[] images = {"up.png", "right.png", "down.png", "left.png", "grass.png"}; + for (String url : images) { + WorldElementBox.images.put(url, new Image(url)); + } + } + + private ImageView lastImageView; + private String lastImageUrl; + private String lastLabel; + + public WorldElementBox(WorldElement element) { + updateImage(element); + updateLabel(element); + this.setAlignment(Pos.CENTER); + } + + private void updateImage(WorldElement element) { + String currImageUrl = element.getResourceString(); + + if (!Objects.equals(lastImageUrl, currImageUrl)) { + ImageView currImageView = new ImageView(images.get(currImageUrl)); + currImageView.setFitHeight(IMAGE_HEIGHT); + currImageView.setFitWidth(IMAGE_WIDTH); + + this.getChildren().remove(lastImageView); + this.getChildren().add(currImageView); + + lastImageUrl = currImageUrl; + lastImageView = currImageView; + } + } + + private void updateLabel(WorldElement element) { + + String currLabel = " "; + + if (element instanceof Animal) { + currLabel = "Z " + element.getPosition().toString(); + } else { + currLabel = "Trawa"; + } + + if (!Objects.equals(currLabel, lastLabel)) { + Label positionLabel = new Label(currLabel); + + this.getChildren().add(positionLabel); + + lastLabel = currLabel; + } + } +} diff --git a/oolab/src/main/resources/down.png b/oolab/src/main/resources/down.png new file mode 100644 index 0000000000000000000000000000000000000000..4dc01601cd4326e77c5f5a1421d5dbd9e918d957 GIT binary patch literal 7891 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 W+IXEef*gC0o5tra8NAkajr(7WbDN3) literal 0 HcmV?d00001 diff --git a/oolab/src/main/resources/grass.png b/oolab/src/main/resources/grass.png new file mode 100644 index 0000000000000000000000000000000000000000..cfb978229244f995f9b496968aae9749dc7b8c26 GIT binary patch literal 8469 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 Q49O4;Rc)1`OICOP2YG4gW&i*H literal 0 HcmV?d00001 diff --git a/oolab/src/main/resources/right.png b/oolab/src/main/resources/right.png new file mode 100644 index 0000000000000000000000000000000000000000..c263a7722f3036e8cddb45c1535daffddf9c2702 GIT binary patch literal 8123 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 Date: Mon, 6 Jan 2025 16:45:40 +0100 Subject: [PATCH 3/7] minor change in error handling for file map display --- oolab/src/main/java/agh/ics/oop/model/util/FileMapDisplay.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oolab/src/main/java/agh/ics/oop/model/util/FileMapDisplay.java b/oolab/src/main/java/agh/ics/oop/model/util/FileMapDisplay.java index 11509d6..dc8c6b3 100644 --- a/oolab/src/main/java/agh/ics/oop/model/util/FileMapDisplay.java +++ b/oolab/src/main/java/agh/ics/oop/model/util/FileMapDisplay.java @@ -21,7 +21,7 @@ public void mapChanged(WorldMap worldMap, String message) { writer.println("-----------------"); } catch (Exception e) { - e.printStackTrace(); + System.out.println(String.format("Failed to save state to file due to error: %s", e.getMessage())); } } } From 606e98d88bec4cff68fedf20f2bd050c72791cc1 Mon Sep 17 00:00:00 2001 From: Szymon Rybski Date: Sun, 19 Jan 2025 22:14:31 +0100 Subject: [PATCH 4/7] first part should be working now --- .../main/java/agh/ics/oop/model/WorldMap.java | 114 ++++----- .../agh/ics/oop/model/util/MapVisualizer.java | 176 ++++++------- oolab_kotlin/.gitignore | 45 ++++ oolab_kotlin/.idea/.gitignore | 8 + oolab_kotlin/.idea/codeStyles/Project.xml | 10 + .../.idea/codeStyles/codeStyleConfig.xml | 5 + oolab_kotlin/.idea/gradle.xml | 16 ++ oolab_kotlin/.idea/kotlinc.xml | 6 + oolab_kotlin/.idea/misc.xml | 10 + oolab_kotlin/.idea/vcs.xml | 6 + oolab_kotlin/build.gradle | 21 ++ oolab_kotlin/gradle.properties | 1 + .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 60756 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 + oolab_kotlin/gradlew | 234 ++++++++++++++++++ oolab_kotlin/gradlew.bat | 89 +++++++ oolab_kotlin/settings.gradle | 5 + oolab_kotlin/src/main/kotlin/Animal.kt | 60 +++++ oolab_kotlin/src/main/kotlin/BouncyMap.kt | 65 +++++ oolab_kotlin/src/main/kotlin/Boundary.kt | 4 + oolab_kotlin/src/main/kotlin/Main.kt | 13 + oolab_kotlin/src/main/kotlin/MapDirection.kt | 27 ++ oolab_kotlin/src/main/kotlin/MoveDirection.kt | 9 + oolab_kotlin/src/main/kotlin/MoveValidator.kt | 5 + .../src/main/kotlin/RandomExtensions.kt | 19 ++ oolab_kotlin/src/main/kotlin/Vector2d.kt | 39 +++ oolab_kotlin/src/main/kotlin/WorldMap.kt | 13 + 27 files changed, 861 insertions(+), 145 deletions(-) create mode 100644 oolab_kotlin/.gitignore create mode 100644 oolab_kotlin/.idea/.gitignore create mode 100644 oolab_kotlin/.idea/codeStyles/Project.xml create mode 100644 oolab_kotlin/.idea/codeStyles/codeStyleConfig.xml create mode 100644 oolab_kotlin/.idea/gradle.xml create mode 100644 oolab_kotlin/.idea/kotlinc.xml create mode 100644 oolab_kotlin/.idea/misc.xml create mode 100644 oolab_kotlin/.idea/vcs.xml create mode 100644 oolab_kotlin/build.gradle create mode 100644 oolab_kotlin/gradle.properties create mode 100644 oolab_kotlin/gradle/wrapper/gradle-wrapper.jar create mode 100644 oolab_kotlin/gradle/wrapper/gradle-wrapper.properties create mode 100644 oolab_kotlin/gradlew create mode 100644 oolab_kotlin/gradlew.bat create mode 100644 oolab_kotlin/settings.gradle create mode 100644 oolab_kotlin/src/main/kotlin/Animal.kt create mode 100644 oolab_kotlin/src/main/kotlin/BouncyMap.kt create mode 100644 oolab_kotlin/src/main/kotlin/Boundary.kt create mode 100644 oolab_kotlin/src/main/kotlin/Main.kt create mode 100644 oolab_kotlin/src/main/kotlin/MapDirection.kt create mode 100644 oolab_kotlin/src/main/kotlin/MoveDirection.kt create mode 100644 oolab_kotlin/src/main/kotlin/MoveValidator.kt create mode 100644 oolab_kotlin/src/main/kotlin/RandomExtensions.kt create mode 100644 oolab_kotlin/src/main/kotlin/Vector2d.kt create mode 100644 oolab_kotlin/src/main/kotlin/WorldMap.kt diff --git a/oolab/src/main/java/agh/ics/oop/model/WorldMap.java b/oolab/src/main/java/agh/ics/oop/model/WorldMap.java index a464e92..2896dea 100644 --- a/oolab/src/main/java/agh/ics/oop/model/WorldMap.java +++ b/oolab/src/main/java/agh/ics/oop/model/WorldMap.java @@ -1,57 +1,57 @@ -package agh.ics.oop.model; - -import agh.ics.oop.model.util.Boundary; -import agh.ics.oop.model.util.IncorrectPositionException; - -import java.util.List; -import java.util.Optional; - -/** - * The interface responsible for interacting with the map of the world. - * Assumes that Vector2d and MoveDirection classes are defined. - * - * @author apohllo, idzik - */ -public interface WorldMap extends agh.ics.oop.model.MoveValidator { - - /** - * Place a animal on the map. - * - * @param animal The animal to place on the map. - */ - void place(Animal animal) throws IncorrectPositionException; - - /** - * Moves an animal (if it is present on the map) according to specified direction. - * If the move is not possible, this method has no effect. - */ - void move(Animal animal, MoveDirection direction); - - /** - * Return true if given position on the map is occupied. Should not be - * confused with canMove since there might be empty positions where the animal - * cannot move. - * - * @param position Position to check. - * @return True if the position is occupied. - */ - boolean isOccupied(Vector2d position); - - /** - * Return an animal at a given position. - * - * @param position The position of the animal. - * @return animal or null if the position is not occupied. - */ - Optional objectAt(Vector2d position); - - boolean canMoveTo(Vector2d position); - - List getElements(); - - Boundary getCurrentBounds(); - - int getId(); - - List getOrderedAnimals(); -} +package agh.ics.oop.model; + +import agh.ics.oop.model.util.Boundary; +import agh.ics.oop.model.util.IncorrectPositionException; + +import java.util.List; +import java.util.Optional; + +/** + * The interface responsible for interacting with the map of the world. + * Assumes that Vector2d and MoveDirection classes are defined. + * + * @author apohllo, idzik + */ +public interface WorldMap extends agh.ics.oop.model.MoveValidator { + + /** + * Place a animal on the map. + * + * @param animal The animal to place on the map. + */ + void place(Animal animal) throws IncorrectPositionException; + + /** + * Moves an animal (if it is present on the map) according to specified direction. + * If the move is not possible, this method has no effect. + */ + void move(Animal animal, MoveDirection direction); + + /** + * Return true if given position on the map is occupied. Should not be + * confused with canMove since there might be empty positions where the animal + * cannot move. + * + * @param position Position to check. + * @return True if the position is occupied. + */ + boolean isOccupied(Vector2d position); + + /** + * Return an animal at a given position. + * + * @param position The position of the animal. + * @return animal or null if the position is not occupied. + */ + Optional objectAt(Vector2d position); + + boolean canMoveTo(Vector2d position); + + List getElements(); + + Boundary getCurrentBounds(); + + int getId(); + + List getOrderedAnimals(); +} diff --git a/oolab/src/main/java/agh/ics/oop/model/util/MapVisualizer.java b/oolab/src/main/java/agh/ics/oop/model/util/MapVisualizer.java index ed17510..911c68e 100644 --- a/oolab/src/main/java/agh/ics/oop/model/util/MapVisualizer.java +++ b/oolab/src/main/java/agh/ics/oop/model/util/MapVisualizer.java @@ -1,88 +1,88 @@ -package agh.ics.oop.model.util; - -import agh.ics.oop.model.Vector2d; -import agh.ics.oop.model.WorldElement; -import agh.ics.oop.model.WorldMap; - -import java.util.Optional; - -/** - * The map visualizer converts the {@link WorldMap} map into a string - * representation. - * - * @author apohllo, idzik - */ -public class MapVisualizer { - private static final String EMPTY_CELL = " "; - private static final String FRAME_SEGMENT = "-"; - private static final String CELL_SEGMENT = "|"; - private final WorldMap map; - - /** - * Initializes the MapVisualizer with an instance of map to visualize. - * - * @param map - */ - public MapVisualizer(WorldMap map) { - this.map = map; - } - - /** - * Convert selected region of the map into a string. It is assumed that the - * indices of the map will have no more than two characters (including the - * sign). - * - * @param lowerLeft The lower left corner of the region that is drawn. - * @param upperRight The upper right corner of the region that is drawn. - * @return String representation of the selected region of the map. - */ - public String draw(Vector2d lowerLeft, Vector2d upperRight) { - StringBuilder builder = new StringBuilder(); - for (int i = upperRight.getY() + 1; i >= lowerLeft.getY() - 1; i--) { - if (i == upperRight.getY() + 1) { - builder.append(drawHeader(lowerLeft, upperRight)); - } - builder.append(String.format("%3d: ", i)); - for (int j = lowerLeft.getX(); j <= upperRight.getX() + 1; j++) { - if (i < lowerLeft.getY() || i > upperRight.getY()) { - builder.append(drawFrame(j <= upperRight.getX())); - } else { - builder.append(CELL_SEGMENT); - if (j <= upperRight.getX()) { - builder.append(drawObject(new Vector2d(j, i))); - } - } - } - builder.append(System.lineSeparator()); - } - return builder.toString(); - } - - private String drawFrame(boolean innerSegment) { - if (innerSegment) { - return FRAME_SEGMENT + FRAME_SEGMENT; - } else { - return FRAME_SEGMENT; - } - } - - private String drawHeader(Vector2d lowerLeft, Vector2d upperRight) { - StringBuilder builder = new StringBuilder(); - builder.append(" y\\x "); - for (int j = lowerLeft.getX(); j < upperRight.getX() + 1; j++) { - builder.append(String.format("%2d", j)); - } - builder.append(System.lineSeparator()); - return builder.toString(); - } - - private String drawObject(Vector2d currentPosition) { - if (this.map.isOccupied(currentPosition)) { - Optional object = this.map.objectAt(currentPosition); - if (object.isPresent()) { - return object.get().toString(); - } - } - return EMPTY_CELL; - } -} +package agh.ics.oop.model.util; + +import agh.ics.oop.model.Vector2d; +import agh.ics.oop.model.WorldElement; +import agh.ics.oop.model.WorldMap; + +import java.util.Optional; + +/** + * The map visualizer converts the {@link WorldMap} map into a string + * representation. + * + * @author apohllo, idzik + */ +public class MapVisualizer { + private static final String EMPTY_CELL = " "; + private static final String FRAME_SEGMENT = "-"; + private static final String CELL_SEGMENT = "|"; + private final WorldMap map; + + /** + * Initializes the MapVisualizer with an instance of map to visualize. + * + * @param map + */ + public MapVisualizer(WorldMap map) { + this.map = map; + } + + /** + * Convert selected region of the map into a string. It is assumed that the + * indices of the map will have no more than two characters (including the + * sign). + * + * @param lowerLeft The lower left corner of the region that is drawn. + * @param upperRight The upper right corner of the region that is drawn. + * @return String representation of the selected region of the map. + */ + public String draw(Vector2d lowerLeft, Vector2d upperRight) { + StringBuilder builder = new StringBuilder(); + for (int i = upperRight.getY() + 1; i >= lowerLeft.getY() - 1; i--) { + if (i == upperRight.getY() + 1) { + builder.append(drawHeader(lowerLeft, upperRight)); + } + builder.append(String.format("%3d: ", i)); + for (int j = lowerLeft.getX(); j <= upperRight.getX() + 1; j++) { + if (i < lowerLeft.getY() || i > upperRight.getY()) { + builder.append(drawFrame(j <= upperRight.getX())); + } else { + builder.append(CELL_SEGMENT); + if (j <= upperRight.getX()) { + builder.append(drawObject(new Vector2d(j, i))); + } + } + } + builder.append(System.lineSeparator()); + } + return builder.toString(); + } + + private String drawFrame(boolean innerSegment) { + if (innerSegment) { + return FRAME_SEGMENT + FRAME_SEGMENT; + } else { + return FRAME_SEGMENT; + } + } + + private String drawHeader(Vector2d lowerLeft, Vector2d upperRight) { + StringBuilder builder = new StringBuilder(); + builder.append(" y\\x "); + for (int j = lowerLeft.getX(); j < upperRight.getX() + 1; j++) { + builder.append(String.format("%2d", j)); + } + builder.append(System.lineSeparator()); + return builder.toString(); + } + + private String drawObject(Vector2d currentPosition) { + if (this.map.isOccupied(currentPosition)) { + Optional object = this.map.objectAt(currentPosition); + if (object.isPresent()) { + return object.get().toString(); + } + } + return EMPTY_CELL; + } +} diff --git a/oolab_kotlin/.gitignore b/oolab_kotlin/.gitignore new file mode 100644 index 0000000..b1dff0d --- /dev/null +++ b/oolab_kotlin/.gitignore @@ -0,0 +1,45 @@ +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### Kotlin ### +.kotlin + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/oolab_kotlin/.idea/.gitignore b/oolab_kotlin/.idea/.gitignore new file mode 100644 index 0000000..1c2fda5 --- /dev/null +++ b/oolab_kotlin/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/oolab_kotlin/.idea/codeStyles/Project.xml b/oolab_kotlin/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..1874b0f --- /dev/null +++ b/oolab_kotlin/.idea/codeStyles/Project.xml @@ -0,0 +1,10 @@ + + + + + + + + \ No newline at end of file diff --git a/oolab_kotlin/.idea/codeStyles/codeStyleConfig.xml b/oolab_kotlin/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..307554b --- /dev/null +++ b/oolab_kotlin/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/oolab_kotlin/.idea/gradle.xml b/oolab_kotlin/.idea/gradle.xml new file mode 100644 index 0000000..38dc828 --- /dev/null +++ b/oolab_kotlin/.idea/gradle.xml @@ -0,0 +1,16 @@ + + + + + + \ No newline at end of file diff --git a/oolab_kotlin/.idea/kotlinc.xml b/oolab_kotlin/.idea/kotlinc.xml new file mode 100644 index 0000000..0a4fba6 --- /dev/null +++ b/oolab_kotlin/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/oolab_kotlin/.idea/misc.xml b/oolab_kotlin/.idea/misc.xml new file mode 100644 index 0000000..5d2b310 --- /dev/null +++ b/oolab_kotlin/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/oolab_kotlin/.idea/vcs.xml b/oolab_kotlin/.idea/vcs.xml new file mode 100644 index 0000000..6c0b863 --- /dev/null +++ b/oolab_kotlin/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/oolab_kotlin/build.gradle b/oolab_kotlin/build.gradle new file mode 100644 index 0000000..a08b843 --- /dev/null +++ b/oolab_kotlin/build.gradle @@ -0,0 +1,21 @@ +plugins { + id 'org.jetbrains.kotlin.jvm' version '2.0.20' +} + +group = 'org.example' +version = '1.0-SNAPSHOT' + +repositories { + mavenCentral() +} + +dependencies { + testImplementation 'org.jetbrains.kotlin:kotlin-test' +} + +test { + useJUnitPlatform() +} +kotlin { + jvmToolchain(21) +} \ No newline at end of file diff --git a/oolab_kotlin/gradle.properties b/oolab_kotlin/gradle.properties new file mode 100644 index 0000000..7fc6f1f --- /dev/null +++ b/oolab_kotlin/gradle.properties @@ -0,0 +1 @@ +kotlin.code.style=official diff --git a/oolab_kotlin/gradle/wrapper/gradle-wrapper.jar b/oolab_kotlin/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..249e5832f090a2944b7473328c07c9755baa3196 GIT binary patch literal 60756 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/oolab_kotlin/gradlew.bat b/oolab_kotlin/gradlew.bat new file mode 100644 index 0000000..ac1b06f --- /dev/null +++ b/oolab_kotlin/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/oolab_kotlin/settings.gradle b/oolab_kotlin/settings.gradle new file mode 100644 index 0000000..56aa75b --- /dev/null +++ b/oolab_kotlin/settings.gradle @@ -0,0 +1,5 @@ +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0' +} +rootProject.name = 'oolab_kotlin' + diff --git a/oolab_kotlin/src/main/kotlin/Animal.kt b/oolab_kotlin/src/main/kotlin/Animal.kt new file mode 100644 index 0000000..6648911 --- /dev/null +++ b/oolab_kotlin/src/main/kotlin/Animal.kt @@ -0,0 +1,60 @@ +package org.example + +import java.util.* + +class Animal( var localizationOnMap: Vector2d = Vector2d(2, 2), val id:Int){ + var facingDirection: MapDirection = MapDirection.NORTH; + + fun move(direction: MoveDirection, validator: MoveValidator){ + when(direction) { + MoveDirection.LEFT -> facingDirection = facingDirection.previous(); + MoveDirection.RIGHT -> facingDirection = facingDirection.next(); + MoveDirection.FORWARD -> { + var newLoc = localizationOnMap + facingDirection.vector2d; + if(validator.canMoveTo(newLoc)){ + localizationOnMap = newLoc; + } + } + MoveDirection.BACKWARD -> { + var newLoc = localizationOnMap - facingDirection.vector2d; + if(validator.canMoveTo(newLoc)){ + localizationOnMap = newLoc; + } + } + } + } + + override fun toString(): String { + return return String.format( + when (facingDirection) { + MapDirection.NORTH -> "^" + MapDirection.EAST -> ">" + MapDirection.WEST -> "<" + MapDirection.SOUTH -> "v" + } + ) + } + + fun isAt(position: Vector2d): Boolean { + return localizationOnMap == position; + } + + override fun equals(other: Any?): Boolean { + if (this === other) return true + if (javaClass != other?.javaClass) return false + + other as Animal + + if (localizationOnMap != other.localizationOnMap) return false + if (facingDirection != other.facingDirection) return false + if (id != other.id) return false + + return true + } + + override fun hashCode(): Int { + return Objects.hash(localizationOnMap, facingDirection, id); + } + + +} \ No newline at end of file diff --git a/oolab_kotlin/src/main/kotlin/BouncyMap.kt b/oolab_kotlin/src/main/kotlin/BouncyMap.kt new file mode 100644 index 0000000..e9f0b2c --- /dev/null +++ b/oolab_kotlin/src/main/kotlin/BouncyMap.kt @@ -0,0 +1,65 @@ +package org.example + +class BouncyMap(val width: Int, val height: Int): WorldMap{ + val lowerLeft: Vector2d = Vector2d(0, 0); + val upperRight: Vector2d = Vector2d(width-1, height-1); + val bounds: Boundary = Boundary(lowerLeft, upperRight); + var animals: HashMap = HashMap(); + override fun place(animal: Animal): Boolean { + if(animals.containsValue(animal)){ + for (pos in animals.keys){ + if (animals[pos] ==animal){ + animals.remove(pos) + break + } + } + } + val animalProposedLocalisation = animal.localizationOnMap + if(!isOccupied(animalProposedLocalisation)){ + animals[animalProposedLocalisation] = animal; + } else{ + var randomPos: Vector2d? = animals.randomFreePosition(upperRight); + if(randomPos != null) { + animal.localizationOnMap = randomPos; + animals[randomPos] = animal; + } else{ + randomPos = animals.randomPosition(); + if(randomPos != null){ + animals.remove(randomPos); + animal.localizationOnMap = randomPos; + animals[randomPos] = animal + } else { + return false; + } + } + } + return true; + } + + + override fun move(animal: Animal, direction: MoveDirection) { + val oldPosition = animal.localizationOnMap; + animal.move(direction, this) + + animals.remove(oldPosition); + place(animal); + + } + + override fun isOccupied(position: Vector2d): Boolean { + return objectAt(position) != null; + } + + override fun objectAt(position: Vector2d): Animal? { + if (animals.containsKey(position)) { + return animals[position]; + } else { + return null; + } + } + + + override fun canMoveTo(position: Vector2d): Boolean { + return position.follows(lowerLeft) && position.precedes(upperRight); + } +} \ No newline at end of file diff --git a/oolab_kotlin/src/main/kotlin/Boundary.kt b/oolab_kotlin/src/main/kotlin/Boundary.kt new file mode 100644 index 0000000..b83eca4 --- /dev/null +++ b/oolab_kotlin/src/main/kotlin/Boundary.kt @@ -0,0 +1,4 @@ +package org.example + +data class Boundary(val lowerLeft: Vector2d, val upperRight: Vector2d) { +} \ No newline at end of file diff --git a/oolab_kotlin/src/main/kotlin/Main.kt b/oolab_kotlin/src/main/kotlin/Main.kt new file mode 100644 index 0000000..a47efa7 --- /dev/null +++ b/oolab_kotlin/src/main/kotlin/Main.kt @@ -0,0 +1,13 @@ +package org.example + +//TIP To Run code, press or +// click the icon in the gutter. +fun main() { + var animal: Animal = Animal(Vector2d(1,1), 0); + var animal2: Animal = Animal(Vector2d(1,1), 1); + var bouncyMap: BouncyMap = BouncyMap(10, 10) + + println(bouncyMap.place(animal)) + println(bouncyMap.place(animal2)) + println(animal2.localizationOnMap) +} \ No newline at end of file diff --git a/oolab_kotlin/src/main/kotlin/MapDirection.kt b/oolab_kotlin/src/main/kotlin/MapDirection.kt new file mode 100644 index 0000000..109921e --- /dev/null +++ b/oolab_kotlin/src/main/kotlin/MapDirection.kt @@ -0,0 +1,27 @@ +package org.example + +enum class MapDirection(val vector2d: Vector2d) { + NORTH(Vector2d(0, 1)), + EAST(Vector2d(1, 0)), + SOUTH(Vector2d(0, -1)), + WEST(Vector2d(-1, 0)), ; + + override fun toString(): String { + return when(this) { + NORTH -> "Północ"; + EAST -> "Wschód"; + SOUTH -> "Południe"; + WEST -> "Zachód"; + } + } + fun next(): MapDirection { + return entries[this.ordinal + 1% entries.size]; + } + + fun previous(): MapDirection { + return entries[(this.ordinal - 1 + entries.size)% entries.size]; + } + + + +} \ No newline at end of file diff --git a/oolab_kotlin/src/main/kotlin/MoveDirection.kt b/oolab_kotlin/src/main/kotlin/MoveDirection.kt new file mode 100644 index 0000000..8f7a8ec --- /dev/null +++ b/oolab_kotlin/src/main/kotlin/MoveDirection.kt @@ -0,0 +1,9 @@ +package org.example + +enum class MoveDirection { + FORWARD, + BACKWARD, + LEFT, + RIGHT, + +} \ No newline at end of file diff --git a/oolab_kotlin/src/main/kotlin/MoveValidator.kt b/oolab_kotlin/src/main/kotlin/MoveValidator.kt new file mode 100644 index 0000000..ddca5f7 --- /dev/null +++ b/oolab_kotlin/src/main/kotlin/MoveValidator.kt @@ -0,0 +1,5 @@ +package org.example + +interface MoveValidator { + fun canMoveTo(position: Vector2d): Boolean; +} \ No newline at end of file diff --git a/oolab_kotlin/src/main/kotlin/RandomExtensions.kt b/oolab_kotlin/src/main/kotlin/RandomExtensions.kt new file mode 100644 index 0000000..ecce4cf --- /dev/null +++ b/oolab_kotlin/src/main/kotlin/RandomExtensions.kt @@ -0,0 +1,19 @@ +package org.example + +import com.sun.jdi.IntegerType + +fun Map.randomPosition(): Vector2d?{ + return this.keys.randomOrNull(); +} + +fun Map.randomFreePosition(mapSize: Vector2d): Vector2d?{ + //var possiblyFreePosition = Vector2d((0..= other.x && y >= other.y; + } + + operator fun plus(other: Vector2d): Vector2d{ + return Vector2d(x + other.x, y + other.y); + } + operator fun minus(other: Vector2d): Vector2d{ + return Vector2d(x - other.x, y - other.y); + } + fun upperRight(other: Vector2d): Vector2d{ + return Vector2d(max(x, other.x), max(y, other.y)); + } + fun lowerLeft(other: Vector2d): Vector2d{ + return Vector2d(min(x, other.x), min(y, other.y)); + } + fun opposite(): Vector2d{ + return Vector2d(-1*x, -1*y); + } +} + +fun MapDirection.toUnitVector(): Vector2d { + return when (this) { + MapDirection.NORTH -> Vector2d(0, 1) + MapDirection.WEST -> Vector2d(-1, 0) + MapDirection.SOUTH -> Vector2d(0, -1) + MapDirection.EAST -> Vector2d(1, 0) + } +} \ No newline at end of file diff --git a/oolab_kotlin/src/main/kotlin/WorldMap.kt b/oolab_kotlin/src/main/kotlin/WorldMap.kt new file mode 100644 index 0000000..fab6c10 --- /dev/null +++ b/oolab_kotlin/src/main/kotlin/WorldMap.kt @@ -0,0 +1,13 @@ +package org.example + +import jdk.internal.foreign.abi.Binding + +interface WorldMap : MoveValidator { + fun place(animal: Animal): Boolean; + + fun move(animal: Animal, direction: MoveDirection); + + fun isOccupied(position: Vector2d) : Boolean; + + fun objectAt(position: Vector2d): Animal?; +} \ No newline at end of file From 703d94f2ab7e037dee22eb0ad5eb7e4296fccb35 Mon Sep 17 00:00:00 2001 From: Szymon Rybski Date: Sun, 19 Jan 2025 22:36:28 +0100 Subject: [PATCH 5/7] added tests and small refactors --- oolab_kotlin/.idea/gradle.xml | 1 + oolab_kotlin/build.gradle | 2 + oolab_kotlin/src/main/kotlin/BouncyMap.kt | 8 +-- oolab_kotlin/src/test/kotlin/BouncyMapTest.kt | 54 +++++++++++++++++++ 4 files changed, 61 insertions(+), 4 deletions(-) create mode 100644 oolab_kotlin/src/test/kotlin/BouncyMapTest.kt diff --git a/oolab_kotlin/.idea/gradle.xml b/oolab_kotlin/.idea/gradle.xml index 38dc828..5ac4c8f 100644 --- a/oolab_kotlin/.idea/gradle.xml +++ b/oolab_kotlin/.idea/gradle.xml @@ -1,5 +1,6 @@ +