diff options
Diffstat (limited to 'src/ch/epfl/maze/physical/stragegies/reducer')
3 files changed, 12 insertions, 12 deletions
diff --git a/src/ch/epfl/maze/physical/stragegies/reducer/BlindChoiceReducer.java b/src/ch/epfl/maze/physical/stragegies/reducer/BlindChoiceReducer.java index 169a8f6..2e8a198 100644 --- a/src/ch/epfl/maze/physical/stragegies/reducer/BlindChoiceReducer.java +++ b/src/ch/epfl/maze/physical/stragegies/reducer/BlindChoiceReducer.java | |||
@@ -1,6 +1,6 @@ | |||
1 | package ch.epfl.maze.physical.stragegies.reducer; | 1 | package ch.epfl.maze.physical.stragegies.reducer; |
2 | 2 | ||
3 | import ch.epfl.maze.physical.World; | 3 | import ch.epfl.maze.physical.Daedalus; |
4 | import ch.epfl.maze.util.Direction; | 4 | import ch.epfl.maze.util.Direction; |
5 | 5 | ||
6 | import java.util.Set; | 6 | import java.util.Set; |
@@ -13,7 +13,7 @@ import java.util.Set; | |||
13 | public interface BlindChoiceReducer extends ChoiceReducer { | 13 | public interface BlindChoiceReducer extends ChoiceReducer { |
14 | 14 | ||
15 | @Override | 15 | @Override |
16 | default Set<Direction> reduce(Set<Direction> choices, World world) { | 16 | default Set<Direction> reduce(Set<Direction> choices, Daedalus daedalus) { |
17 | return this.reduce(choices); | 17 | return this.reduce(choices); |
18 | } | 18 | } |
19 | 19 | ||
diff --git a/src/ch/epfl/maze/physical/stragegies/reducer/CaseReducer.java b/src/ch/epfl/maze/physical/stragegies/reducer/CaseReducer.java index 837bd4b..71de287 100644 --- a/src/ch/epfl/maze/physical/stragegies/reducer/CaseReducer.java +++ b/src/ch/epfl/maze/physical/stragegies/reducer/CaseReducer.java | |||
@@ -1,6 +1,6 @@ | |||
1 | package ch.epfl.maze.physical.stragegies.reducer; | 1 | package ch.epfl.maze.physical.stragegies.reducer; |
2 | 2 | ||
3 | import ch.epfl.maze.physical.World; | 3 | import ch.epfl.maze.physical.Daedalus; |
4 | import ch.epfl.maze.util.Direction; | 4 | import ch.epfl.maze.util.Direction; |
5 | 5 | ||
6 | import java.util.Set; | 6 | import java.util.Set; |
@@ -16,17 +16,17 @@ public interface CaseReducer extends ChoiceReducer { | |||
16 | /** | 16 | /** |
17 | * Checks if the given choice should be kept or excluded by the filter. | 17 | * Checks if the given choice should be kept or excluded by the filter. |
18 | * | 18 | * |
19 | * @param choice A Direction | 19 | * @param choice A Direction |
20 | * @param world The World | 20 | * @param daedalus The Daedalus |
21 | * @return T(The filter should keep the given choice) | 21 | * @return T(The filter should keep the given choice) |
22 | */ | 22 | */ |
23 | boolean keepChoice(Direction choice, World world); | 23 | boolean keepChoice(Direction choice, Daedalus daedalus); |
24 | 24 | ||
25 | @Override | 25 | @Override |
26 | default Set<Direction> reduce(Set<Direction> choices, World world) { | 26 | default Set<Direction> reduce(Set<Direction> choices, Daedalus daedalus) { |
27 | return choices | 27 | return choices |
28 | .stream() | 28 | .stream() |
29 | .filter(choice -> this.keepChoice(choice, world)) | 29 | .filter(choice -> this.keepChoice(choice, daedalus)) |
30 | .collect(Collectors.toSet()); | 30 | .collect(Collectors.toSet()); |
31 | } | 31 | } |
32 | 32 | ||
diff --git a/src/ch/epfl/maze/physical/stragegies/reducer/ChoiceReducer.java b/src/ch/epfl/maze/physical/stragegies/reducer/ChoiceReducer.java index 3cb744d..c7e8833 100644 --- a/src/ch/epfl/maze/physical/stragegies/reducer/ChoiceReducer.java +++ b/src/ch/epfl/maze/physical/stragegies/reducer/ChoiceReducer.java | |||
@@ -1,8 +1,7 @@ | |||
1 | package ch.epfl.maze.physical.stragegies.reducer; | 1 | package ch.epfl.maze.physical.stragegies.reducer; |
2 | 2 | ||
3 | import ch.epfl.maze.physical.World; | 3 | import ch.epfl.maze.physical.Daedalus; |
4 | import ch.epfl.maze.util.Direction; | 4 | import ch.epfl.maze.util.Direction; |
5 | import ch.epfl.maze.util.Vector2D; | ||
6 | 5 | ||
7 | import java.util.Set; | 6 | import java.util.Set; |
8 | 7 | ||
@@ -26,9 +25,10 @@ public interface ChoiceReducer { | |||
26 | * In this variation, the animal knows the world entirely. It can therefore | 25 | * In this variation, the animal knows the world entirely. It can therefore |
27 | * use the position of other animals in the world to move more effectively. | 26 | * use the position of other animals in the world to move more effectively. |
28 | * | 27 | * |
29 | * @param choices The choices left to the animal | 28 | * @param choices The choices left to the animal |
29 | * @param daedalus The daedalus in which the animal moves | ||
30 | * @return A subset of possible direction of the animal, chosen in {@code choices} | 30 | * @return A subset of possible direction of the animal, chosen in {@code choices} |
31 | */ | 31 | */ |
32 | Set<Direction> reduce(Set<Direction> choices, World world); | 32 | Set<Direction> reduce(Set<Direction> choices, Daedalus daedalus); |
33 | 33 | ||
34 | } | 34 | } |