Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deleted imports of deleted files #172

Merged
merged 1 commit into from
Sep 23, 2024
Merged

deleted imports of deleted files #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ...ect/src/main/java/de/unistuttgart/informatik/fius/jvk/provided/factories/BushFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 0 additions & 1 deletion project/src/main/java/de/unistuttgart/informatik/fius/jvk/provided/factories/NutFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
14 changes: 0 additions & 14 deletions .../src/main/java/de/unistuttgart/informatik/fius/jvk/provided/programs/SafeWalkProgram.java
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion project/src/main/java/de/unistuttgart/informatik/fius/jvk/tasks/OptionalLabyrinthTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;


Expand Down
10 changes: 5 additions & 5 deletions project/src/main/java/de/unistuttgart/informatik/fius/jvk/tasks/Sheet2Task3.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
46 changes: 23 additions & 23 deletions project/src/main/java/de/unistuttgart/informatik/fius/jvk/tasks/Sheet3Task1.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
}
2 changes: 1 addition & 1 deletion project/src/main/java/de/unistuttgart/informatik/fius/jvk/tasks/Sheet3Task2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
1 change: 0 additions & 1 deletion project/src/main/java/de/unistuttgart/informatik/fius/jvk/tasks/Sheet4Task2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;

Expand Down
1 change: 0 additions & 1 deletion ...t/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/ExtraSheetTask3Verifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion ...main/java/de/unistuttgart/informatik/fius/jvk/verifier/OptionalLabyrinthTaskVerifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;


Expand Down
1 change: 0 additions & 1 deletion project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet1Task3Verifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;


Expand Down
1 change: 0 additions & 1 deletion project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet2Task1Verifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
9 changes: 4 additions & 5 deletions project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet2Task2Verifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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()
Expand All @@ -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()) {
Expand Down
1 change: 0 additions & 1 deletion project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet2Task3Verifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
1 change: 0 additions & 1 deletion project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet2Task4Verifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 0 additions & 2 deletions project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet2Task5Verifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;


Expand Down
1 change: 0 additions & 1 deletion project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet2Task6Verifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet3Task1Verifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;


Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet3Task2Verifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet3Task3Verifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;


/**
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet3Task4Verifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;


/**
Expand Down
1 change: 0 additions & 1 deletion project/src/main/java/de/unistuttgart/informatik/fius/jvk/verifier/Sheet4Task1Verifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;


Expand Down
Loading