Use Set instead of array for Direction choices

5 files changed, 58 insertions, 64 deletions

diff --git a/src/ch/epfl/maze/physical/zoo/Bear.java b/src/ch/epfl/maze/physical/zoo/Bear.java
index 803b574..11faba5 100644
--- a/src/ch/epfl/maze/physical/zoo/Bear.java
+++ b/src/ch/epfl/maze/physical/zoo/Bear.java
@@ -4,9 +4,7 @@ import ch.epfl.maze.physical.Animal;
 import ch.epfl.maze.util.Direction;
 import ch.epfl.maze.util.Vector2D;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.Set;
 
 /**
  * Bear A.I. that implements the Pledge Algorithm.
@@ -53,16 +51,15 @@ public class Bear extends Animal {
     /**
      * Finds a currentDirection following the "left paw rule".
      *
-     * @param choices An array of possible directions
+     * @param choices A set of possible directions
      * @return The currentDirection to take according to the "left paw rule"
      */
-    private Direction followLeft(Direction[] choices) {
-        if (choices.length == 0) return Direction.NONE;
-        if (choices.length == 1) return choices[0];
+    private Direction followLeft(Set<Direction> choices) {
+        if (choices.isEmpty()) return Direction.NONE;
+        if (choices.size() == 1) return choices.stream().findAny().get();
 
-        List<Direction> choiceList = new ArrayList<>(Arrays.asList(choices));
         Direction dir = this.getPreferredDir();
-        while (!choiceList.contains(dir)) dir = dir.rotateRight();
+        while (!choices.contains(dir)) dir = dir.rotateRight();
 
         return dir;
     }
@@ -76,9 +73,9 @@ public class Bear extends Animal {
      * leaves the maze.
      */
     @Override
-    public Direction move(Direction[] choices) {
+    public Direction move(Set<Direction> choices) {
         if (this.favoriteDirection == Direction.NONE)
-            this.favoriteDirection = choices[0];
+            this.favoriteDirection = choices.stream().findAny().get();
 
         Direction newDirection = this.followLeft(choices);
 
diff --git a/src/ch/epfl/maze/physical/zoo/Hamster.java b/src/ch/epfl/maze/physical/zoo/Hamster.java
index 150880c..527e8ce 100644
--- a/src/ch/epfl/maze/physical/zoo/Hamster.java
+++ b/src/ch/epfl/maze/physical/zoo/Hamster.java
@@ -6,8 +6,8 @@ import ch.epfl.maze.util.Direction;
 import ch.epfl.maze.util.Vector2D;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -34,15 +34,14 @@ public class Hamster extends ProbabilisticAnimal {
     /**
      * Discard directions known to lead to dead ends.
      *
-     * @param choices An array of choices
-     * @return An array of smart choices
+     * @param choices A set of choices
+     * @return A set of smart choices
      */
-    private Direction[] excludeDeadPaths(Direction[] choices) {
-        return (new ArrayList<>(Arrays.asList(choices)))
+    private Set<Direction> excludeDeadPaths(Set<Direction> choices) {
+        return choices
                 .stream()
                 .filter(dir -> !this.deadPaths.contains(this.getPosition().addDirectionTo(dir)))
-                .collect(Collectors.toList())
-                .toArray(new Direction[0]);
+                .collect(Collectors.toSet());
     }
 
     /**
@@ -50,9 +49,9 @@ public class Hamster extends ProbabilisticAnimal {
      * it learns during its journey.
      */
     @Override
-    public Direction move(Direction[] choices) {
-        Direction[] smartChoices = this.excludeDeadPaths(choices);
-        if (smartChoices.length == 1) this.deadPaths.add(this.getPosition()); // dead end
+    public Direction move(Set<Direction> choices) {
+        Set<Direction> smartChoices = this.excludeDeadPaths(choices);
+        if (smartChoices.size() == 1) this.deadPaths.add(this.getPosition()); // dead end
         return super.move(smartChoices);
     }
 
diff --git a/src/ch/epfl/maze/physical/zoo/Monkey.java b/src/ch/epfl/maze/physical/zoo/Monkey.java
index 119781c..23eec4e 100644
--- a/src/ch/epfl/maze/physical/zoo/Monkey.java
+++ b/src/ch/epfl/maze/physical/zoo/Monkey.java
@@ -4,9 +4,7 @@ import ch.epfl.maze.physical.Animal;
 import ch.epfl.maze.util.Direction;
 import ch.epfl.maze.util.Vector2D;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.Set;
 
 /**
  * Monkey A.I. that puts its hand on the left wall and follows it.
@@ -31,13 +29,12 @@ public class Monkey extends Animal {
     /**
      * Finds a currentDirection following the "left paw rule".
      *
-     * @param choices An array of possible directions
+     * @param choices A set of possible directions
      * @return The currentDirection to take according to the "left paw rule"
      */
-    private Direction followLeft(Direction[] choices) {
-        List<Direction> choiceList = new ArrayList<>(Arrays.asList(choices));
+    private Direction followLeft(Set<Direction> choices) {
         Direction dir = this.currentDirection.rotateLeft();
-        while (!choiceList.contains(dir)) dir = dir.rotateRight();
+        while (!choices.contains(dir)) dir = dir.rotateRight();
 
         return dir;
     }
@@ -45,13 +42,13 @@ public class Monkey extends Animal {
     /**
      * Determines the strategy to follow depending on special cases.
      *
-     * @param choices An array of possible directions
+     * @param choices A set of possible directions
      * @return The Direction to take
      */
-    private Direction findDirection(Direction[] choices) {
-        if (choices.length == 0) return Direction.NONE;
-        if (this.currentDirection == Direction.NONE) return choices[0];
-        if (choices.length == 1) return choices[0];
+    private Direction findDirection(Set<Direction> choices) {
+        if (choices.isEmpty()) return Direction.NONE;
+        if (this.currentDirection == Direction.NONE) return choices.stream().findAny().get();
+        if (choices.size() == 1) return choices.stream().findAny().get();
         return this.followLeft(choices);
     }
 
@@ -59,7 +56,7 @@ public class Monkey extends Animal {
      * Moves according to the relative left wall that the monkey has to follow.
      */
     @Override
-    public Direction move(Direction[] choices) {
+    public Direction move(Set<Direction> choices) {
         this.currentDirection = this.findDirection(choices);
         return this.currentDirection;
     }
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;
     }