jai regler un problem par rapport au TargetStrategy au niveau des imports et...

jai regler un problem par rapport au TargetStrategy au niveau des imports et du coup new TargetStrategy marche

src/main/java/model/FireFighter.java

@@ -13,10 +13,10 @@ public class FireFighter {
 
     }
 
-    public void setFirefighterPositions(Position firefighterPositions) {
+    public void setFirefighterPosition(Position firefighterPositions) {
             this.firefighterPositions = firefighterPositions;
     }
-    public Position getFirefighterPositions() {
+    public Position getFirefighterPosition() {
         return firefighterPositions;
     }
 }

src/main/java/model/FirefighterBoard.java

 package model;
 
 import util.Position;
+import util.TargetStrategy;
 
 import java.util.*;
 
@@ -56,10 +57,12 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
   public List<ModelElement> getState(Position position) {
     List<ModelElement> result = new ArrayList<>();
     for (FireFighter firefighter : firefighter)
-      if (firefighter.getFirefighterPositions().equals(position))
+      if (firefighter.getFirefighterPosition().equals(position))
         result.add(ModelElement.FIREFIGHTER);
-    if (fire.contains(position))
-      result.add(ModelElement.FIRE);
+
+    for (Fire fire: fire)
+      if (fire.getFirePositions().equals(position))
+       result.add(ModelElement.FIRE);
     return result;
   }
 
@@ -84,10 +87,12 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
     List<Position> modifiedPositions = new ArrayList<>();
     if (step % 2 == 0) {
       List<Position> newFirePositions = new ArrayList<>();
-      for (Position fire : firePositions) {
+      for (Fire fire : fire) {
         newFirePositions.addAll(neighbors.get(fire));
       }
-      firePositions.addAll(newFirePositions);
+      for(Position position : newFirePositions) {
+        fire.add(new Fire(position));
+      }
       modifiedPositions.addAll(newFirePositions);
     }
     return modifiedPositions;
@@ -102,7 +107,7 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
   private List<Position> updateFirefighters() {
     List<Position> modifiedPosition = new ArrayList<>();
     List<Position> firefighterNewPositions = new ArrayList<>();
-    for (Position firefighterPosition : firefighterPositions) {
+    for (FireFighter firefighterPosition : firefighter) {
       Position newFirefighterPosition =
               targetStrategy.neighborClosestToFire(firefighterPosition,
                       firePositions, neighbors);

src/main/java/util/TargetStrategy.java

-package model;
+package util;
 
 import util.Position;