diff --git a/src/main/java/util/MotorizedStrategy.java b/src/main/java/util/MotorizedStrategy.java new file mode 100644 index 0000000000000000000000000000000000000000..6f5b092c3764a2b2070a1ee8ab2c3c9b26d3eb10 --- /dev/null +++ b/src/main/java/util/MotorizedStrategy.java @@ -0,0 +1,22 @@ +package util; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +public class MotorizedStrategy implements Strategy{ + @Override + public Position neighborClosestToTarget(Position position, Collection<Position> targets, Map<Position, List<Position>> neighbors) { + TargetStrategy normalStrategy = new TargetStrategy(); + Position firstMove = normalStrategy.neighborClosestToTarget(position, targets, neighbors); + + // Si un premier mouvement est trouvé, on simule un second déplacement + if (firstMove != null && neighbors.containsKey(firstMove)) { + return normalStrategy.neighborClosestToTarget(firstMove, targets, neighbors); + } + + return position; + } + + +} diff --git a/src/main/java/util/TargetStrategy.java b/src/main/java/util/TargetStrategy.java index 5e2e743affb2795efbf641942452fe0339d5bce9..78ccadc73aa1e14f05a3be62b0b4cd1ed8627080 100644 --- a/src/main/java/util/TargetStrategy.java +++ b/src/main/java/util/TargetStrategy.java @@ -4,7 +4,7 @@ import util.Position; import java.util.*; -public class TargetStrategy { +public class TargetStrategy implements Strategy{ /** @@ -12,7 +12,7 @@ public class TargetStrategy { * @param targets positions that are targeted. * @return the position next to the current position that is on the path to the closest target. */ - public Position neighborClosestToFire(Position position, Collection<Position> targets, + public Position neighborClosestToTarget(Position position, Collection<Position> targets, Map<Position, List<Position>> neighbors) { Set<Position> seen = new HashSet<Position>(); HashMap<Position, Position> firstMove = new HashMap<Position, Position>();