From f8e1a79a0294ed9454e34d623ac1c17abba24ced Mon Sep 17 00:00:00 2001 From: Sara Date: Sun, 22 Sep 2024 01:43:26 +0200 Subject: [PATCH] deleted imports of deleted files --- .../jvk/provided/factories/BushFactory.java | 1 - .../jvk/provided/factories/NutFactory.java | 1 - .../provided/programs/SafeWalkProgram.java | 14 ------ .../fius/jvk/tasks/OptionalLabyrinthTask.java | 1 - .../fius/jvk/tasks/Sheet2Task3.java | 10 ++-- .../fius/jvk/tasks/Sheet3Task1.java | 46 +++++++++---------- .../fius/jvk/tasks/Sheet3Task2.java | 2 +- .../fius/jvk/tasks/Sheet4Task2.java | 1 - .../jvk/verifier/ExtraSheetTask3Verifier.java | 1 - .../OptionalLabyrinthTaskVerifier.java | 1 - .../jvk/verifier/Sheet1Task3Verifier.java | 1 - .../jvk/verifier/Sheet2Task1Verifier.java | 1 - .../jvk/verifier/Sheet2Task2Verifier.java | 9 ++-- .../jvk/verifier/Sheet2Task3Verifier.java | 1 - .../jvk/verifier/Sheet2Task4Verifier.java | 1 - .../jvk/verifier/Sheet2Task5Verifier.java | 2 - .../jvk/verifier/Sheet2Task6Verifier.java | 1 - .../jvk/verifier/Sheet3Task1Verifier.java | 5 +- .../jvk/verifier/Sheet3Task2Verifier.java | 4 +- .../jvk/verifier/Sheet3Task3Verifier.java | 4 +- .../jvk/verifier/Sheet3Task4Verifier.java | 1 - .../jvk/verifier/Sheet4Task1Verifier.java | 1 - 22 files changed, 39 insertions(+), 70 deletions(-) delete mode 100644 project/src/main/java/de/unistuttgart/informatik/fius/jvk/provided/programs/SafeWalkProgram.java diff --git a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/provided/factories/BushFactory.java b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/provided/factories/BushFactory.java index 85c4d68f..02d40c3c 100644 --- a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/provided/factories/BushFactory.java +++ b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/provided/factories/BushFactory.java @@ -2,7 +2,6 @@ import de.unistuttgart.informatik.fius.icge.simulation.tools.PlayfieldModifier; import de.unistuttgart.informatik.fius.jvk.provided.entity.Bush; -import de.unistuttgart.informatik.fius.jvk.provided.entity.Wall; import java.util.function.Supplier; diff --git a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/provided/factories/NutFactory.java b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/provided/factories/NutFactory.java index 47832549..45d446f9 100644 --- a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/provided/factories/NutFactory.java +++ b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/provided/factories/NutFactory.java @@ -1,7 +1,6 @@ package de.unistuttgart.informatik.fius.jvk.provided.factories; import de.unistuttgart.informatik.fius.icge.simulation.tools.PlayfieldModifier; -import de.unistuttgart.informatik.fius.jvk.provided.entity.Coin; import de.unistuttgart.informatik.fius.jvk.provided.entity.Nut; import java.util.function.Supplier; diff --git a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/provided/programs/SafeWalkProgram.java b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/provided/programs/SafeWalkProgram.java deleted file mode 100644 index e88f9bd7..00000000 --- a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/provided/programs/SafeWalkProgram.java +++ /dev/null @@ -1,14 +0,0 @@ -package de.unistuttgart.informatik.fius.jvk.provided.programs; - -import de.unistuttgart.informatik.fius.icge.simulation.programs.Program; -import de.unistuttgart.informatik.fius.jvk.provided.entity.Neo; - - -public class SafeWalkProgram implements Program { - @Override - public void run(Neo neo) { - if (neo.canMove()) { - neo.move(); - } - } -} diff --git a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/tasks/OptionalLabyrinthTask.java b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/tasks/OptionalLabyrinthTask.java index 8f773329..9379f8af 100644 --- a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/tasks/OptionalLabyrinthTask.java +++ b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/tasks/OptionalLabyrinthTask.java @@ -15,7 +15,6 @@ import de.unistuttgart.informatik.fius.icge.simulation.tools.PlayfieldModifier; import de.unistuttgart.informatik.fius.jvk.provided.entity.*; import de.unistuttgart.informatik.fius.jvk.provided.factories.BushFactory; -import de.unistuttgart.informatik.fius.jvk.provided.factories.WallFactory; import de.unistuttgart.informatik.fius.jvk.provided.shapes.Rectangle; diff --git a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/tasks/Sheet2Task3.java b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/tasks/Sheet2Task3.java index a53899e1..94a557ba 100644 --- a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/tasks/Sheet2Task3.java +++ b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/tasks/Sheet2Task3.java @@ -25,11 +25,11 @@ public class Sheet2Task3 implements Task{ @Override public void run(Simulation sim) { PlayfieldModifier pm = new PlayfieldModifier(sim.getPlayfield()); - pm.placeEntityAt(new Coin(), new Position(0, 0)); - pm.placeEntityAt(new Coin(), new Position(0, 1)); - pm.placeEntityAt(new Coin(), new Position(0, 2)); - pm.placeEntityAt(new Coin(), new Position(1, 2)); - pm.placeMultipleEntitiesAt(new CoinFactory(), 2, new Position(2, 2)); + pm.placeEntityAt(new Nut(), new Position(0, 0)); + pm.placeEntityAt(new Nut(), new Position(0, 1)); + pm.placeEntityAt(new Nut(), new Position(0, 2)); + pm.placeEntityAt(new Nut(), new Position(1, 2)); + pm.placeMultipleEntitiesAt(new NutFactory(), 2, new Position(2, 2)); Totoro totoro = new Totoro(); pm.placeEntityAt(totoro, new Position(0, 0)); diff --git a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/tasks/Sheet3Task1.java b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/tasks/Sheet3Task1.java index 4e14f398..ecf76484 100644 --- a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/tasks/Sheet3Task1.java +++ b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/tasks/Sheet3Task1.java @@ -88,39 +88,39 @@ private void preparePlayingField(Simulation sim) { new Rectangle(new Position(-1, 3), new Position(11, 5)), new Rectangle(new Position(-1, 5), new Position(11, 7)) ); - pm.placeEntityAtEachPosition(new WallFactory(), walls); + pm.placeEntityAtEachPosition(new BushFactory(), walls); // place coins Random r = new Random(); // e - pm.placeMultipleEntitiesAt(new CoinFactory(), r.nextInt(15) + 20, new Position(22, 0)); + pm.placeMultipleEntitiesAt(new NutFactory(), r.nextInt(15) + 20, new Position(22, 0)); //f) - pm.placeMultipleEntitiesAt(() -> new Coin(), 15, new Position(0, 2)); + pm.placeMultipleEntitiesAt(() -> new Nut(), 15, new Position(0, 2)); //g) - pm.placeMultipleEntitiesAt(new CoinFactory(), r.nextInt(10), new Position(1, 4)); - pm.placeMultipleEntitiesAt(new CoinFactory(), 7, new Position(2, 4)); - pm.placeMultipleEntitiesAt(new CoinFactory(), 2, new Position(3, 4)); - pm.placeMultipleEntitiesAt(new CoinFactory(), r.nextInt(10), new Position(4, 4)); - pm.placeMultipleEntitiesAt(new CoinFactory(), r.nextInt(10), new Position(5, 4)); - pm.placeMultipleEntitiesAt(new CoinFactory(), r.nextInt(10), new Position(6, 4)); - pm.placeMultipleEntitiesAt(new CoinFactory(), r.nextInt(10), new Position(7, 4)); - pm.placeMultipleEntitiesAt(new CoinFactory(), 0, new Position(8, 4)); - pm.placeMultipleEntitiesAt(new CoinFactory(), r.nextInt(10), new Position(9, 4)); - pm.placeMultipleEntitiesAt(new CoinFactory(), r.nextInt(10), new Position(10, 4)); + pm.placeMultipleEntitiesAt(new NutFactory(), r.nextInt(10), new Position(1, 4)); + pm.placeMultipleEntitiesAt(new NutFactory(), 7, new Position(2, 4)); + pm.placeMultipleEntitiesAt(new NutFactory(), 2, new Position(3, 4)); + pm.placeMultipleEntitiesAt(new NutFactory(), r.nextInt(10), new Position(4, 4)); + pm.placeMultipleEntitiesAt(new NutFactory(), r.nextInt(10), new Position(5, 4)); + pm.placeMultipleEntitiesAt(new NutFactory(), r.nextInt(10), new Position(6, 4)); + pm.placeMultipleEntitiesAt(new NutFactory(), r.nextInt(10), new Position(7, 4)); + pm.placeMultipleEntitiesAt(new NutFactory(), 0, new Position(8, 4)); + pm.placeMultipleEntitiesAt(new NutFactory(), r.nextInt(10), new Position(9, 4)); + pm.placeMultipleEntitiesAt(new NutFactory(), r.nextInt(10), new Position(10, 4)); //h) - pm.placeMultipleEntitiesAt(new CoinFactory(), 7, new Position(1, 6)); - pm.placeMultipleEntitiesAt(new CoinFactory(), r.nextInt(15), new Position(2, 6)); - pm.placeMultipleEntitiesAt(new CoinFactory(), r.nextInt(15), new Position(3, 6)); - pm.placeMultipleEntitiesAt(new CoinFactory(), r.nextInt(15), new Position(4, 6)); - pm.placeMultipleEntitiesAt(new CoinFactory(), r.nextInt(15), new Position(5, 6)); - pm.placeMultipleEntitiesAt(new CoinFactory(), 0, new Position(6, 6)); - pm.placeMultipleEntitiesAt(new CoinFactory(), r.nextInt(15), new Position(7, 6)); - pm.placeMultipleEntitiesAt(new CoinFactory(), r.nextInt(15), new Position(8, 6)); - pm.placeMultipleEntitiesAt(new CoinFactory(), 8, new Position(9, 6)); - pm.placeMultipleEntitiesAt(new CoinFactory(), r.nextInt(15), new Position(10, 6)); + pm.placeMultipleEntitiesAt(new NutFactory(), 7, new Position(1, 6)); + pm.placeMultipleEntitiesAt(new NutFactory(), r.nextInt(15), new Position(2, 6)); + pm.placeMultipleEntitiesAt(new NutFactory(), r.nextInt(15), new Position(3, 6)); + pm.placeMultipleEntitiesAt(new NutFactory(), r.nextInt(15), new Position(4, 6)); + pm.placeMultipleEntitiesAt(new NutFactory(), r.nextInt(15), new Position(5, 6)); + pm.placeMultipleEntitiesAt(new NutFactory(), 0, new Position(6, 6)); + pm.placeMultipleEntitiesAt(new NutFactory(), r.nextInt(15), new Position(7, 6)); + pm.placeMultipleEntitiesAt(new NutFactory(), r.nextInt(15), new Position(8, 6)); + pm.placeMultipleEntitiesAt(new NutFactory(), 8, new Position(9, 6)); + pm.placeMultipleEntitiesAt(new NutFactory(), r.nextInt(15), new Position(10, 6)); } } diff --git a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/tasks/Sheet3Task2.java b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/tasks/Sheet3Task2.java index 6cdb0714..61993ef1 100644 --- a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/tasks/Sheet3Task2.java +++ b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/tasks/Sheet3Task2.java @@ -54,7 +54,7 @@ private void preparePlayingField(Simulation sim) { new Line(new Position(-10, 7), new Position(13, 7)), new Line(new Position(14,3), new Position(30,3)) ); - pm.placeEntityAtEachPosition(new WallFactory(), bushes); + pm.placeEntityAtEachPosition(new BushFactory(), bushes); Random r = new Random(); diff --git a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/tasks/Sheet4Task2.java b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/tasks/Sheet4Task2.java index 62d5ba33..f1ec13d3 100644 --- a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/tasks/Sheet4Task2.java +++ b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/tasks/Sheet4Task2.java @@ -14,7 +14,6 @@ import de.unistuttgart.informatik.fius.icge.simulation.Simulation; import de.unistuttgart.informatik.fius.icge.simulation.tasks.Task; import de.unistuttgart.informatik.fius.icge.simulation.tools.PlayfieldModifier; -import de.unistuttgart.informatik.fius.jvk.provided.entity.Neo; import de.unistuttgart.informatik.fius.jvk.provided.factories.*; import de.unistuttgart.informatik.fius.jvk.provided.shapes.*; diff --git a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/ExtraSheetTask3Verifier.java b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/ExtraSheetTask3Verifier.java index 18e1b433..b0bf6373 100644 --- a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/ExtraSheetTask3Verifier.java +++ b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/ExtraSheetTask3Verifier.java @@ -21,7 +21,6 @@ import de.unistuttgart.informatik.fius.icge.ui.TaskVerificationStatus; import de.unistuttgart.informatik.fius.jvk.provided.BasicTaskInformation; import de.unistuttgart.informatik.fius.jvk.provided.entity.Nut; -import de.unistuttgart.informatik.fius.jvk.provided.entity.Nut; /** * @author Jannik Graef diff --git a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/OptionalLabyrinthTaskVerifier.java b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/OptionalLabyrinthTaskVerifier.java index b0982bfb..843751ee 100644 --- a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/OptionalLabyrinthTaskVerifier.java +++ b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/OptionalLabyrinthTaskVerifier.java @@ -9,7 +9,6 @@ import de.unistuttgart.informatik.fius.icge.ui.TaskInformation; import de.unistuttgart.informatik.fius.icge.ui.TaskVerificationStatus; import de.unistuttgart.informatik.fius.jvk.provided.BasicTaskInformation; -import de.unistuttgart.informatik.fius.jvk.provided.entity.Coin; import de.unistuttgart.informatik.fius.jvk.provided.entity.Nut; diff --git a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet1Task3Verifier.java b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet1Task3Verifier.java index f7db0ee9..68a565a7 100644 --- a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet1Task3Verifier.java +++ b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet1Task3Verifier.java @@ -12,7 +12,6 @@ import de.unistuttgart.informatik.fius.icge.ui.TaskInformation; import de.unistuttgart.informatik.fius.icge.ui.TaskVerificationStatus; import de.unistuttgart.informatik.fius.jvk.provided.BasicTaskInformation; -import de.unistuttgart.informatik.fius.jvk.provided.entity.Coin; import de.unistuttgart.informatik.fius.jvk.provided.entity.Nut; diff --git a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet2Task1Verifier.java b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet2Task1Verifier.java index 04df1de1..eebadbe6 100644 --- a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet2Task1Verifier.java +++ b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet2Task1Verifier.java @@ -14,7 +14,6 @@ import de.unistuttgart.informatik.fius.icge.ui.TaskInformation; import de.unistuttgart.informatik.fius.icge.ui.TaskVerificationStatus; import de.unistuttgart.informatik.fius.jvk.provided.BasicTaskInformation; -import de.unistuttgart.informatik.fius.jvk.provided.entity.Coin; public class Sheet2Task1Verifier implements TaskVerifier { diff --git a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet2Task2Verifier.java b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet2Task2Verifier.java index 95a7dd1e..1f571e12 100644 --- a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet2Task2Verifier.java +++ b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet2Task2Verifier.java @@ -14,9 +14,8 @@ import de.unistuttgart.informatik.fius.icge.ui.TaskInformation; import de.unistuttgart.informatik.fius.icge.ui.TaskVerificationStatus; import de.unistuttgart.informatik.fius.jvk.provided.BasicTaskInformation; -import de.unistuttgart.informatik.fius.jvk.provided.entity.Coin; -import de.unistuttgart.informatik.fius.jvk.provided.entity.PhoneBooth; -import de.unistuttgart.informatik.fius.jvk.provided.entity.Wall; +import de.unistuttgart.informatik.fius.jvk.provided.entity.Bush; +import de.unistuttgart.informatik.fius.jvk.provided.entity.Home_Tree; public class Sheet2Task2Verifier implements TaskVerifier { @@ -61,7 +60,7 @@ public void verify() { Optional maybeGoal = spawnActions.stream() .map((action) -> action.getEntity()) - .filter((entity) -> (entity instanceof PhoneBooth)) + .filter((entity) -> (entity instanceof Home_Tree)) .findFirst(); Optional maybeWall = spawnActions.stream() @@ -72,7 +71,7 @@ public void verify() { return true; // only spawns between player and goal! }) .map((action) -> action.getEntity()) - .filter((entity) -> (entity instanceof Wall)) + .filter((entity) -> (entity instanceof Bush)) .findFirst(); if (maybePlayer.isEmpty() || maybeGoal.isEmpty()) { diff --git a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet2Task3Verifier.java b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet2Task3Verifier.java index f563c8e8..794b2626 100644 --- a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet2Task3Verifier.java +++ b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet2Task3Verifier.java @@ -12,7 +12,6 @@ import de.unistuttgart.informatik.fius.icge.ui.TaskInformation; import de.unistuttgart.informatik.fius.icge.ui.TaskVerificationStatus; import de.unistuttgart.informatik.fius.jvk.provided.BasicTaskInformation; -import de.unistuttgart.informatik.fius.jvk.provided.entity.Coin; import de.unistuttgart.informatik.fius.jvk.provided.entity.Nut; /** diff --git a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet2Task4Verifier.java b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet2Task4Verifier.java index 8b7686ff..304c7a81 100644 --- a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet2Task4Verifier.java +++ b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet2Task4Verifier.java @@ -10,7 +10,6 @@ import de.unistuttgart.informatik.fius.icge.ui.TaskInformation; import de.unistuttgart.informatik.fius.icge.ui.TaskVerificationStatus; import de.unistuttgart.informatik.fius.jvk.provided.BasicTaskInformation; -import de.unistuttgart.informatik.fius.jvk.provided.entity.Coin; public class Sheet2Task4Verifier implements TaskVerifier { diff --git a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet2Task5Verifier.java b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet2Task5Verifier.java index 99f467a8..f0243e9f 100644 --- a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet2Task5Verifier.java +++ b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet2Task5Verifier.java @@ -15,9 +15,7 @@ import de.unistuttgart.informatik.fius.icge.ui.TaskVerificationStatus; import de.unistuttgart.informatik.fius.jvk.provided.BasicTaskInformation; import de.unistuttgart.informatik.fius.jvk.provided.entity.Bush; -import de.unistuttgart.informatik.fius.jvk.provided.entity.Coin; import de.unistuttgart.informatik.fius.jvk.provided.entity.Nut; -import de.unistuttgart.informatik.fius.jvk.provided.entity.Wall; import de.unistuttgart.informatik.fius.jvk.provided.shapes.*; diff --git a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet2Task6Verifier.java b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet2Task6Verifier.java index 2920a1ff..1ec38779 100644 --- a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet2Task6Verifier.java +++ b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet2Task6Verifier.java @@ -12,7 +12,6 @@ import de.unistuttgart.informatik.fius.icge.ui.TaskInformation; import de.unistuttgart.informatik.fius.icge.ui.TaskVerificationStatus; import de.unistuttgart.informatik.fius.jvk.provided.BasicTaskInformation; -import de.unistuttgart.informatik.fius.jvk.provided.entity.Coin; public class Sheet2Task6Verifier implements TaskVerifier { diff --git a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet3Task1Verifier.java b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet3Task1Verifier.java index 3513696e..f843ee38 100644 --- a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet3Task1Verifier.java +++ b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet3Task1Verifier.java @@ -15,8 +15,7 @@ import de.unistuttgart.informatik.fius.icge.ui.TaskInformation; import de.unistuttgart.informatik.fius.icge.ui.TaskVerificationStatus; import de.unistuttgart.informatik.fius.jvk.provided.BasicTaskInformation; -import de.unistuttgart.informatik.fius.jvk.provided.entity.Coin; -import de.unistuttgart.informatik.fius.jvk.provided.entity.Neo; +import de.unistuttgart.informatik.fius.jvk.provided.entity.Nut; import de.unistuttgart.informatik.fius.jvk.provided.entity.Totoro; @@ -142,7 +141,7 @@ public void verify() { .findFirst(); long coinsNeoH = this.actionLog.getActionsOfType(EntitySpawnAction.class, true).stream() - .filter((action) -> action.getEntity() instanceof Coin) + .filter((action) -> action.getEntity() instanceof Nut) .filter((action) -> { Position pos = action.getPosition(); if (pos.getY() != 6) return false; diff --git a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet3Task2Verifier.java b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet3Task2Verifier.java index 9b440377..d522306b 100644 --- a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet3Task2Verifier.java +++ b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet3Task2Verifier.java @@ -292,7 +292,7 @@ public void verify() { long coinsInWallet = this.actionLog.getActionsOfTypeOfEntity(neo, EntityCollectAction.class, true).stream() - .filter((action) -> action.getCollectedEntity() instanceof Coin) + .filter((action) -> action.getCollectedEntity() instanceof Nut) .map((action) -> action.getCollectedEntity()) .distinct() .count(); @@ -330,7 +330,7 @@ private int getNumberOfCoinsAtPosition(int x, int y) { } private int getNumberOfCoinsAtPosition(Position pos) { - return this.sim.getPlayfield().getEntitiesOfTypeAt(pos, Coin.class, true).size(); + return this.sim.getPlayfield().getEntitiesOfTypeAt(pos, Nut.class, true).size(); } @Override diff --git a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet3Task3Verifier.java b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet3Task3Verifier.java index 80ac43e6..18a76408 100644 --- a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet3Task3Verifier.java +++ b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet3Task3Verifier.java @@ -11,7 +11,7 @@ import de.unistuttgart.informatik.fius.icge.ui.TaskInformation; import de.unistuttgart.informatik.fius.icge.ui.TaskVerificationStatus; import de.unistuttgart.informatik.fius.jvk.provided.BasicTaskInformation; -import de.unistuttgart.informatik.fius.jvk.provided.entity.Coin; +import de.unistuttgart.informatik.fius.jvk.provided.entity.Nut; /** @@ -145,7 +145,7 @@ private int getNumberOfCoinsAtPosition(int x, int y) { } private int getNumberOfCoinsAtPosition(Position pos) { - return this.sim.getPlayfield().getEntitiesOfTypeAt(pos, Coin.class, true).size(); + return this.sim.getPlayfield().getEntitiesOfTypeAt(pos, Nut.class, true).size(); } @Override diff --git a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet3Task4Verifier.java b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet3Task4Verifier.java index 06138a77..6468f938 100644 --- a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet3Task4Verifier.java +++ b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet3Task4Verifier.java @@ -10,7 +10,6 @@ import de.unistuttgart.informatik.fius.icge.ui.TaskInformation; import de.unistuttgart.informatik.fius.icge.ui.TaskVerificationStatus; import de.unistuttgart.informatik.fius.jvk.provided.BasicTaskInformation; -import de.unistuttgart.informatik.fius.jvk.provided.entity.Coin; /** diff --git a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet4Task1Verifier.java b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet4Task1Verifier.java index 828d0f2d..eba7c8b3 100644 --- a/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet4Task1Verifier.java +++ b/project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet4Task1Verifier.java @@ -12,7 +12,6 @@ import de.unistuttgart.informatik.fius.icge.ui.TaskInformation; import de.unistuttgart.informatik.fius.icge.ui.TaskVerificationStatus; import de.unistuttgart.informatik.fius.jvk.provided.BasicTaskInformation; -import de.unistuttgart.informatik.fius.jvk.provided.entity.Coin; import de.unistuttgart.informatik.fius.jvk.provided.entity.Nut;