sfdsdfsd

src/main/java/model/FirefighterBoard.java

@@ -93,7 +93,7 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
 
   //result contient FirefighterPosition , newfigherfighterposition ,neighborfirepositions
   //this function update the firefighter position to the nearest fire position and extinguish fire from this psoition and all the neighbor positions to this fire
-
+//**
   private List<Position> updateFirefighters() {
     List<Position> result = new ArrayList<>();
     List<Position> firefighterNewPositions = new ArrayList<>();

src/main/java/newmodel/Extinguisher.java

+package newmodel;
+
+import newmodel.Fboard;
+import util.Position;
+
+import java.util.List;
+
+public interface Extinguisher {
+    public List<Position> updateExtinguisher(Fboard board);
+    public void extinguish();
+    public void setState();
+    public String getState();
+
+}

src/main/java/newmodel/Fboard.java

+package newmodel;
+
+import util.Position;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+public class Fboard {
+    private final int columnCount;
+    private final int rowCount;
+    private int step = 0;
+    private final Random randomGenerator = new Random();
+
+    private List<FireManager> fire;
+    private List<Extinguisher> extinguishe;
+
+    public Fboard(int columnCount, int rowCount) {
+        this.columnCount = columnCount;
+        this.rowCount = rowCount;
+        this.fire=new ArrayList<>();
+        this.extinguishe=new ArrayList<>();
+        }
+    private Position randomPosition() {
+        return new Position(randomGenerator.nextInt(rowCount), randomGenerator.nextInt(columnCount));
+    }
+
+    public int rowCount() {
+        return rowCount;
+    }
+
+    public int columnCount() {
+        return columnCount;
+    }
+
+    public List<Position> updateToNextGeneration() {
+        List<Position> result = new ArrayList<>();
+        for (FireManager f : fire) {
+           result.addAll(f.updateFire(this));
+        }
+        for(Extinguisher e : extinguishe) {
+            result.addAll(e.updateExtinguisher(this));
+        }
+        step++;
+        return result;
+    }
+
+    public int stepNumber() {
+        return step;
+    }
+    public void reset() {
+        step = 0;
+        initializeElements();
+    }
+    public void   initializeElements() {
+        for (FireManager f : fire) {
+            f.initialise
+        }
+
+
+
+
+
+    }
+    }
+
+
+
+
+}

src/main/java/newmodel/Fire.java

+package newmodel;
+
+import util.Position;
+
+import java.util.List;
+
+public class Fire implements FireManager {
+
+    private final int initialFireCount;
+
+
+    public Fire(int initialFireCount) {
+        this.initialFireCount = initialFireCount;
+    }
+
+    @Override
+    public List<Position> updateFire(Fboard board) {
+        return null;
+    }
+
+    @Override
+    public void setState() {
+
+    }
+
+    @Override
+    public String getState() {
+        return null;
+    }
+}

src/main/java/newmodel/FireFighter.java

+package newmodel;
+
+import newmodel.Extinguisher;
+import newmodel.Fboard;
+import util.Position;
+
+import java.util.List;
+
+public class FireFighter implements Extinguisher {
+    @Override
+    public List<Position> updateExtinguisher(Fboard board) {
+        return null;
+    }
+
+    @Override
+    public void extinguish() {
+
+    }
+
+    @Override
+    public void setState() {
+
+    }
+
+    @Override
+    public String getState() {
+        return null;
+    }
+}

src/main/java/newmodel/FireManager.java

+package newmodel;
+
+import newmodel.Fboard;
+import util.Position;
+
+import java.util.List;
+
+public interface FireManager {
+    public List<Position> updateFire(Fboard board);
+    public void setState();
+    public String getState();
+}