1 files changed, 31 insertions, 6 deletions

diff --git a/src/ch/epfl/maze/physical/zoo/Hamster.java b/src/ch/epfl/maze/physical/zoo/Hamster.java
index 2a610f2..27706a5 100644
--- a/src/ch/epfl/maze/physical/zoo/Hamster.java
+++ b/src/ch/epfl/maze/physical/zoo/Hamster.java
@@ -1,15 +1,23 @@
 package ch.epfl.maze.physical.zoo;
 
 import ch.epfl.maze.physical.Animal;
+import ch.epfl.maze.physical.ProbabilisticAnimal;
 import ch.epfl.maze.util.Direction;
 import ch.epfl.maze.util.Vector2D;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Hamster A.I. that remembers the previous choice it has made and the dead ends
  * it has already met.
+ *
+ * @author Pacien TRAN-GIRARD
  */
 
-public class Hamster extends Animal {
+public class Hamster extends ProbabilisticAnimal {
+
+    private final List<Vector2D> deadPaths;
 
     /**
      * Constructs a hamster with a starting position.
@@ -19,7 +27,24 @@ public class Hamster extends Animal {
 
     public Hamster(Vector2D position) {
         super(position);
-        // TODO
+        this.deadPaths = new ArrayList<>();
+    }
+
+    /**
+     * Discard directions known to lead to dead ends.
+     *
+     * @param choices An array of choices
+     * @return An array of smart choices
+     */
+
+    private Direction[] excludeDeadPaths(Direction[] choices) {
+        List<Direction> smartChoices = new ArrayList<>();
+
+        for (Direction dir : choices)
+            if (!this.deadPaths.contains(this.getPosition().addDirectionTo(dir)))
+                smartChoices.add(dir);
+
+        return smartChoices.toArray(new Direction[smartChoices.size()]);
     }
 
     /**
@@ -29,13 +54,13 @@ public class Hamster extends Animal {
 
     @Override
     public Direction move(Direction[] choices) {
-        // TODO
-        return Direction.NONE;
+        Direction[] smartChoices = this.excludeDeadPaths(choices);
+        if (smartChoices.length == 1) this.deadPaths.add(this.getPosition()); // dead end
+        return super.move(smartChoices);
     }
 
     @Override
     public Animal copy() {
-        // TODO
-        return null;
+        return new Hamster(this.getPosition());
     }
 }