Refactor Daedalus residence

8 files changed, 76 insertions, 109 deletions

diff --git a/src/ch/epfl/maze/physical/DaedalusAware.java b/src/ch/epfl/maze/physical/DaedalusAware.java
new file mode 100644
index 0000000..16f20ee
--- /dev/null
+++ b/src/ch/epfl/maze/physical/DaedalusAware.java
@@ -0,0 +1,54 @@
+package ch.epfl.maze.physical;
+
+import ch.epfl.maze.util.Direction;
+import ch.epfl.maze.util.Vector2D;
+
+import java.util.Arrays;
+import java.util.EnumSet;
+import java.util.Set;
+
+/**
+ * @author Pacien TRAN-GIRARD
+ */
+public interface DaedalusAware {
+
+    /**
+     * Retrieves the next direction of the animal, by selecting one choice among
+     * the ones available from its position.
+     * <p>
+     * In this variation, the animal knows the world entirely. It can therefore
+     * use the position of other animals in the daedalus to hunt or to evade predators
+     * more effectively.
+     *
+     * @param choices  The choices left to the animal at its current position (see
+     *                 {@link ch.epfl.maze.physical.World#getChoices(Vector2D)
+     *                 World.getChoices(Vector2D)})
+     * @param daedalus The world in which the animal moves
+     * @return The next direction of the animal, chosen in {@code choices}
+     * @implNote Not abstract for compatibility purpose (in order not to break tests)
+     */
+    default Direction move(Set<Direction> choices, Daedalus daedalus) {
+        return null;
+    }
+
+    /**
+     * Retrieves the next direction of the animal, by selecting one choice among
+     * the ones available from its position.
+     * <p>
+     * In this variation, the animal knows the world entirely. It can therefore
+     * use the position of other animals in the daedalus to hunt or to evade predators
+     * more effectively.
+     *
+     * @param choices  The choices left to the animal at its current position (see
+     *                 {@link ch.epfl.maze.physical.World#getChoices(Vector2D)
+     *                 World.getChoices(Vector2D)})
+     * @param daedalus The world in which the animal moves
+     * @return The next direction of the animal, chosen in {@code choices}
+     * @apiNote Not final for compatibility purpose (in order not to break tests)
+     * @deprecated Use @code{Direction move(Set<Direction> choices, Daedalus daedalus)} instead
+     */
+    default Direction move(Direction[] choices, Daedalus daedalus) {
+        return this.move(EnumSet.copyOf(Arrays.asList(choices)), daedalus);
+    }
+
+}
diff --git a/src/ch/epfl/maze/physical/Predator.java b/src/ch/epfl/maze/physical/Predator.java
index ad5900e..9cc7256 100644
--- a/src/ch/epfl/maze/physical/Predator.java
+++ b/src/ch/epfl/maze/physical/Predator.java
@@ -1,19 +1,14 @@
 package ch.epfl.maze.physical;
 
-import ch.epfl.maze.util.Direction;
 import ch.epfl.maze.util.Vector2D;
 
-import java.util.Arrays;
-import java.util.EnumSet;
-import java.util.Set;
-
 /**
  * Predator that kills a prey when they meet with each other in the labyrinth.
  *
  * @author EPFL
  * @author Pacien TRAN-GIRARD
  */
-abstract public class Predator extends ProbabilisticAnimal {
+abstract public class Predator extends Animal implements DaedalusAware {
 
     /**
      * Constructs a predator with a specified position.
@@ -24,43 +19,4 @@ abstract public class Predator extends ProbabilisticAnimal {
         super(position);
     }
 
-    /**
-     * Retrieves the next direction of the animal, by selecting one choice among
-     * the ones available from its position.
-     * <p>
-     * In this variation, the animal knows the world entirely. It can therefore
-     * use the position of other animals in the daedalus to hunt more
-     * effectively.
-     *
-     * @param choices  The choices left to the animal at its current position (see
-     *                 {@link ch.epfl.maze.physical.World#getChoices(Vector2D)
-     *                 World.getChoices(Vector2D)})
-     * @param daedalus The world in which the animal moves
-     * @return The next direction of the animal, chosen in {@code choices}
-     * @implNote Not abstract for compatibility purpose (in order not to break tests)
-     */
-    public Direction move(Set<Direction> choices, Daedalus daedalus) {
-        return null;
-    }
-
-    /**
-     * Retrieves the next direction of the animal, by selecting one choice among
-     * the ones available from its position.
-     * <p>
-     * In this variation, the animal knows the world entirely. It can therefore
-     * use the position of other animals in the daedalus to hunt more
-     * effectively.
-     *
-     * @param choices  The choices left to the animal at its current position (see
-     *                 {@link ch.epfl.maze.physical.World#getChoices(Vector2D)
-     *                 World.getChoices(Vector2D)})
-     * @param daedalus The world in which the animal moves
-     * @return The next direction of the animal, chosen in {@code choices}
-     * @apiNote Not final for compatibility purpose (in order not to break tests)
-     * @deprecated Use @code{Direction move(Set<Direction> choices, Daedalus daedalus)} instead
-     */
-    public Direction move(Direction[] choices, Daedalus daedalus) {
-        return this.move(EnumSet.copyOf(Arrays.asList(choices)), daedalus);
-    }
-
 }
diff --git a/src/ch/epfl/maze/physical/Prey.java b/src/ch/epfl/maze/physical/Prey.java
index ff760c5..0ad62ff 100644
--- a/src/ch/epfl/maze/physical/Prey.java
+++ b/src/ch/epfl/maze/physical/Prey.java
@@ -1,19 +1,14 @@
 package ch.epfl.maze.physical;
 
-import ch.epfl.maze.util.Direction;
 import ch.epfl.maze.util.Vector2D;
 
-import java.util.Arrays;
-import java.util.EnumSet;
-import java.util.Set;
-
 /**
  * Prey that is killed by a predator when they meet each other in the labyrinth.
  *
  * @author EPFL
  * @author Pacien TRAN-GIRARD
  */
-abstract public class Prey extends ProbabilisticAnimal {
+abstract public class Prey extends Animal implements DaedalusAware {
 
     /**
      * Constructs a prey with a specified position.
@@ -24,43 +19,4 @@ abstract public class Prey extends ProbabilisticAnimal {
         super(position);
     }
 
-    /**
-     * Retrieves the next direction of the animal, by selecting one choice among
-     * the ones available from its position.
-     * <p>
-     * In this variation, the animal knows the world entirely. It can therefore
-     * use the position of other animals in the daedalus to evade predators more
-     * effectively.
-     *
-     * @param choices  The choices left to the animal at its current position (see
-     *                 {@link ch.epfl.maze.physical.World#getChoices(Vector2D)
-     *                 World.getChoices(Vector2D)})
-     * @param daedalus The world in which the animal moves
-     * @return The next direction of the animal, chosen in {@code choices}
-     * @implNote Not abstract for compatibility purpose (in order not to break tests)
-     */
-    public Direction move(Set<Direction> choices, Daedalus daedalus) {
-        return null;
-    }
-
-    /**
-     * Retrieves the next direction of the animal, by selecting one choice among
-     * the ones available from its position.
-     * <p>
-     * In this variation, the animal knows the world entirely. It can therefore
-     * use the position of other animals in the daedalus to evade predators more
-     * effectively.
-     *
-     * @param choices  The choices left to the animal at its current position (see
-     *                 {@link ch.epfl.maze.physical.World#getChoices(Vector2D)
-     *                 World.getChoices(Vector2D)})
-     * @param daedalus The world in which the animal moves
-     * @return The next direction of the animal, chosen in {@code choices}
-     * @apiNote Not final for compatibility purpose (in order not to break tests)
-     * @deprecated Use @code{Direction move(Set<Direction> choices, Daedalus daedalus)} instead
-     */
-    public Direction move(Direction[] choices, Daedalus daedalus) {
-        return this.move(EnumSet.copyOf(Arrays.asList(choices)), daedalus);
-    }
-
 }
diff --git a/src/ch/epfl/maze/physical/stragegies/picker/BlindPicker.java b/src/ch/epfl/maze/physical/stragegies/picker/BlindPicker.java
index 6dcf229..02cb1ef 100644
--- a/src/ch/epfl/maze/physical/stragegies/picker/BlindPicker.java
+++ b/src/ch/epfl/maze/physical/stragegies/picker/BlindPicker.java
@@ -1,6 +1,6 @@
 package ch.epfl.maze.physical.stragegies.picker;
 
-import ch.epfl.maze.physical.World;
+import ch.epfl.maze.physical.Daedalus;