1 files changed, 16 insertions, 3 deletions

diff --git a/src/ch/epfl/maze/physical/pacman/PacMan.java b/src/ch/epfl/maze/physical/pacman/PacMan.java
index e2a55e9..5458dd5 100644
--- a/src/ch/epfl/maze/physical/pacman/PacMan.java
+++ b/src/ch/epfl/maze/physical/pacman/PacMan.java
@@ -4,7 +4,8 @@ import ch.epfl.maze.physical.Animal;
 import ch.epfl.maze.physical.Daedalus;
 import ch.epfl.maze.physical.Prey;
 import ch.epfl.maze.physical.stragegies.picker.RandomPicker;
-import ch.epfl.maze.physical.stragegies.reducer.BackwardReducer;
+import ch.epfl.maze.physical.stragegies.planner.DistanceCalculator;
+import ch.epfl.maze.physical.stragegies.reducer.CostReducer;
 import ch.epfl.maze.util.Direction;
 import ch.epfl.maze.util.Vector2D;
 
@@ -16,7 +17,7 @@ import java.util.Set;
  * @author EPFL
  * @author Pacien TRAN-GIRARD
  */
-public class PacMan extends Prey implements BackwardReducer, RandomPicker {
+public class PacMan extends Prey implements DistanceCalculator, CostReducer, RandomPicker {
 
     /**
      * Constructs a new Pac-Man.
@@ -28,8 +29,20 @@ public class PacMan extends Prey implements BackwardReducer, RandomPicker {
     }
 
     @Override
+    public int getChoiceCost(Direction choice, Daedalus daedalus) {
+        return (-1) * daedalus
+                .getPredatorSet()
+                .stream()
+                .map(pred -> this.getDistanceTo(choice, pred.getPosition()))
+                .map(dist -> dist * 100.0d)
+                .min(Double::compare)
+                .get()
+                .intValue();
+    }
+
+    @Override
     public Direction move(Set<Direction> choices, Daedalus daedalus) {
-        Set<Direction> smartChoices = choices.size() > 1 ? this.reduce(choices) : choices;
+        Set<Direction> smartChoices = this.reduce(choices, daedalus);
         return this.pick(smartChoices);
     }