Use Set instead of array for Direction choices

1 files changed, 10 insertions, 10 deletions

diff --git a/src/ch/epfl/maze/physical/GhostPredator.java b/src/ch/epfl/maze/physical/GhostPredator.java
index e4a64b3..c1cfca8 100644
--- a/src/ch/epfl/maze/physical/GhostPredator.java
+++ b/src/ch/epfl/maze/physical/GhostPredator.java
@@ -3,8 +3,8 @@ package ch.epfl.maze.physical;
 import ch.epfl.maze.util.Direction;
 import ch.epfl.maze.util.Vector2D;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.EnumSet;
+import java.util.Set;
 
 /**
  * Predator ghost that have two different modes and a home position in the labyrinth.
@@ -138,11 +138,11 @@ abstract public class GhostPredator extends Predator {
      * Selects the best Direction in the given choices by minimizing the Euclidean distance to the targeted position.
      *
      * @param targetPosition The targeted position
-     * @param choices        An array of Direction choices
-     * @return An array of optimal Direction choices
+     * @param choices        A set of Direction choices
+     * @return A set of optimal Direction choices
      */
-    private Direction[] selectBestPaths(Vector2D targetPosition, Direction[] choices) {
-        List<Direction> bestPaths = new ArrayList<>();
+    private Set<Direction> selectBestPaths(Vector2D targetPosition, Set<Direction> choices) {
+        Set<Direction> bestPaths = EnumSet.noneOf(Direction.class);
         double minDist = Double.MAX_VALUE;
 
         for (Direction dir : choices) {
@@ -157,7 +157,7 @@ abstract public class GhostPredator extends Predator {
                 bestPaths.add(dir);
         }
 
-        return bestPaths.toArray(new Direction[bestPaths.size()]);
+        return bestPaths;
     }
 
     /**
@@ -179,11 +179,11 @@ abstract public class GhostPredator extends Predator {
     }
 
     @Override
-    public Direction move(Direction[] choices, Daedalus daedalus) {
+    public Direction move(Set<Direction> choices, Daedalus daedalus) {
         this.countCycle();
 
-        Direction[] smartChoices = choices.length > 1 ? this.excludeOrigin(choices) : choices;
-        Direction[] bestPaths = this.selectBestPaths(this.getTargetPosition(daedalus), smartChoices);
+        Set<Direction> smartChoices = choices.size() > 1 ? this.excludeOrigin(choices) : choices;
+        Set<Direction> bestPaths = this.selectBestPaths(this.getTargetPosition(daedalus), smartChoices);
         return this.move(bestPaths);
     }