1 files changed, 27 insertions, 28 deletions

diff --git a/src/ch/epfl/maze/physical/zoo/Panda.java b/src/ch/epfl/maze/physical/zoo/Panda.java
index ce38fda..f4c2035 100644
--- a/src/ch/epfl/maze/physical/zoo/Panda.java
+++ b/src/ch/epfl/maze/physical/zoo/Panda.java
@@ -6,8 +6,8 @@ import ch.epfl.maze.util.Direction;
 import ch.epfl.maze.util.Trail;
 import ch.epfl.maze.util.Vector2D;
 
-import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.EnumSet;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -33,11 +33,11 @@ public class Panda extends ProbabilisticAnimal {
     /**
      * Checks if the current position is an intersection given the possible choices.
      *
-     * @param choices An array of possible Directions
+     * @param choices A set of possible Directions
      * @return T(the current position is an intersection)
      */
-    private boolean isIntersection(Direction[] choices) {
-        return choices.length > 2;
+    private boolean isIntersection(Set<Direction> choices) {
+        return choices.size() > 2;
     }
 
     /**
@@ -54,12 +54,12 @@ public class Panda extends ProbabilisticAnimal {
     /**
      * Checks if all Direction choices are leading to the given Marking.
      *
-     * @param choices An array of possible Directions
+     * @param choices A set of possible Directions
      * @param marking The Marking
      * @return T(all choices are leading to positions with the given Marking)
      */
-    private boolean allChoicesLeadingTo(Direction[] choices, Trail.Marking marking) {
-        return (new ArrayList<>(Arrays.asList(choices)))
+    private boolean allChoicesLeadingTo(Set<Direction> choices, Trail.Marking marking) {
+        return choices
                 .stream()
                 .allMatch(dir -> this.getMarkingAtDirection(dir) == marking);
     }
@@ -67,48 +67,47 @@ public class Panda extends ProbabilisticAnimal {
     /**
      * Selects the Direction choices leading to the given Marking.
      *
-     * @param choices An array of possible Directions
+     * @param choices A set of possible Directions
      * @param marking The Marking
-     * @return An array of choices leading to the given Marking
+     * @return A set of choices leading to the given Marking
      */
-    private Direction[] selectDirectionsWithMarking(Direction[] choices, Trail.Marking marking) {
-        return (new ArrayList<>(Arrays.asList(choices)))
+    private Set<Direction> selectDirectionsWithMarking(Set<Direction> choices, Trail.Marking marking) {
+        return choices
                 .stream()
                 .filter(dir -> this.getMarkingAtDirection(dir) == marking)
-                .collect(Collectors.toList())
-                .toArray(new Direction[0]);
+                .collect(Collectors.toSet());
     }
 
     /**
      * Selects the best choices according to the neighbours Markings.
      *
-     * @param choices An array of possible Directions
-     * @return An array of smart choices
+     * @param choices A set of possible Directions
+     * @return A set of smart choices
      */
-    private Direction[] selectBestDirections(Direction[] choices) {
+    private Set<Direction> selectBestDirections(Set<Direction> choices) {
         // special case
         if (this.isIntersection(choices) && this.allChoicesLeadingTo(choices, Trail.Marking.AVOID_MARKING))
-            return new Direction[]{this.getDirection().reverse()};
+            return EnumSet.of(this.getDirection().reverse());
 
         // general case
         for (Trail.Marking mark : Trail.Marking.ALL) {
-            Direction[] smartChoices = this.selectDirectionsWithMarking(choices, mark);
-            if (smartChoices.length > 0) return smartChoices;
+            Set<Direction> smartChoices = this.selectDirectionsWithMarking(choices, mark);
+            if (!smartChoices.isEmpty()) return smartChoices;
         }
 
         // panda is trapped :(
-        return new Direction[]{};
+        return EnumSet.noneOf(Direction.class);
     }
 
     /**
      * Determines if the current position should be marked according to the rules of the <i>Trémeaux's Algorithm</i>,
      * avoiding intersections over-marking.
      *
-     * @param choices An array of possible Directions
+     * @param choices A set of possible Directions
      * @param choice  The selected Direction
      * @return T(the current position should be marked)
      */
-    private boolean shouldMarkCurrentPosition(Direction[] choices, Direction choice) {
+    private boolean shouldMarkCurrentPosition(Set<Direction> choices, Direction choice) {
         return !(this.isIntersection(choices)
                 && this.trail.getMarking(this.getPosition()) == Trail.Marking.AVOID_MARKING
                 && this.getMarkingAtDirection(choice) == Trail.Marking.NO_MARKING);
@@ -117,10 +116,10 @@ public class Panda extends ProbabilisticAnimal {
     /**
      * Marks the current position according to the rules of the <i>Trémeaux's Algorithm</i>.
      *
-     * @param choices An array of possible Direction to take
+     * @param choices A set of possible Direction to take
      */
-    private void markCurrentPosition(Direction[] choices) {
-        if (choices.length == 1 && this.allChoicesLeadingTo(choices, Trail.Marking.AVOID_MARKING)) // dead end
+    private void markCurrentPosition(Set<Direction> choices) {
+        if (choices.size() == 1 && this.allChoicesLeadingTo(choices, Trail.Marking.AVOID_MARKING)) // dead end
             this.trail.markPosition(this.getPosition(), Trail.Marking.NO_GO_MARKING);
         else
             this.trail.markPosition(this.getPosition());
@@ -133,8 +132,8 @@ public class Panda extends ProbabilisticAnimal {
      * have to be handled, especially when the panda is at an intersection.
      */
     @Override
-    public Direction move(Direction[] choices) {
-        Direction[] smartChoices = this.selectBestDirections(choices);
+    public Direction move(Set<Direction> choices) {
+        Set<Direction> smartChoices = this.selectBestDirections(choices);
         Direction choice = super.move(smartChoices);
 
         if (this.shouldMarkCurrentPosition(choices, choice))