Refactor Mouse strategy

1 files changed, 16 insertions, 2 deletions

diff --git a/src/ch/epfl/maze/physical/zoo/Mouse.java b/src/ch/epfl/maze/physical/zoo/Mouse.java
index f7084d7..8f68af6 100644
--- a/src/ch/epfl/maze/physical/zoo/Mouse.java
+++ b/src/ch/epfl/maze/physical/zoo/Mouse.java
@@ -1,16 +1,20 @@
 package ch.epfl.maze.physical.zoo;
 
 import ch.epfl.maze.physical.Animal;
-import ch.epfl.maze.physical.ProbabilisticAnimal;
+import ch.epfl.maze.physical.stragegies.picker.RandomPicker;
+import ch.epfl.maze.physical.stragegies.reducer.BackwardReducer;
+import ch.epfl.maze.util.Direction;
 import ch.epfl.maze.util.Vector2D;
 
+import java.util.Set;
+
 /**
  * Mouse A.I. that remembers only the previous choice it has made.
  *
  * @author EPFL
  * @author Pacien TRAN-GIRARD
  */
-public class Mouse extends ProbabilisticAnimal {
+public class Mouse extends Animal implements BackwardReducer, RandomPicker {
 
     /**
      * Constructs a mouse with a starting position.
@@ -21,6 +25,16 @@ public class Mouse extends ProbabilisticAnimal {
         super(position);
     }
 
+    /**
+     * Moves according to an improved version of a <i>random walk</i> : the
+     * mouse does not directly retrace its steps.
+     */
+    @Override
+    public Direction move(Set<Direction> choices) {
+        Set<Direction> smartChoices = choices.size() > 1 ? this.reduce(choices) : choices;
+        return this.pick(smartChoices);
+    }
+
     @Override
     public Animal copy() {
         return new Mouse(this.getPosition());