deleted imports of deleted files

FIUS · Sep 21, 2024 · f8e1a79 · f8e1a79
1 parent 3c1f2ca
commit f8e1a79
Show file tree

Hide file tree

Showing 22 changed files with 39 additions and 70 deletions.
diff --git a/...ect/src/main/java/de/unistuttgart/informatik/fius/jvk/provided/factories/BushFactory.java b/...ect/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
@@ -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/.../src/main/java/de/unistuttgart/informatik/fius/jvk/provided/programs/SafeWalkProgram.java b/.../src/main/java/de/unistuttgart/informatik/fius/jvk/provided/programs/SafeWalkProgram.java
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...t/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/ExtraSheetTask3Verifier.java b/...t/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/...main/java/de/unistuttgart/informatik/fius/jvk/verifier/OptionalLabyrinthTaskVerifier.java b/...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
@@ -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
@@ -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
@@ -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<Entity> maybeGoal = spawnActions.stream()
             .map((action) -> action.getEntity())
-            .filter((entity) -> (entity instanceof PhoneBooth))
+            .filter((entity) -> (entity instanceof Home_Tree))
             .findFirst();
 
         Optional<Entity> 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;