cloud DONE

src/main/java/model/FFBoard.java

@@ -18,7 +18,7 @@ public class FFBoard implements Board<List<ModelElement>> {
   private final Random randomGenerator = new Random();
 
   public FFBoard(int columnCount, int rowCount, int initialFireCount, int initialFirefighterCount) {
-    boardData=new FFBoardData();
+    boardData=new FFBoardData(columnCount,rowCount);
     FFUpdater=new FFUpdater();
     this.columnCount = columnCount;
     this.rowCount = rowCount;
@@ -42,9 +42,11 @@ public class FFBoard implements Board<List<ModelElement>> {
 
   public void initializeElements() {
     boardData.initialize();
-
+    FFUpdater= new FFUpdater();
     for (int index = 0; index < initialFireCount; index++)
       boardData.getPositions().get(ModelElement.FIRE.ordinal()).add(randomPosition());
+    //for (int index = 0; index < initialFireCount; index++)
+      //boardData.getPositions().get(ModelElement.CLOUD.ordinal()).add(randomPosition());
     for (int index = 0; index < initialFirefighterCount; index++)
       boardData.getPositions().get(ModelElement.FIREFIGHTER.ordinal()).add(randomPosition());
   }
@@ -56,11 +58,15 @@ public class FFBoard implements Board<List<ModelElement>> {
   @Override
   public List<ModelElement> getState(Position position) {
     List<Position> firefighterPositions=boardData.getPositions().get(ModelElement.FIREFIGHTER.ordinal());
+    List<Position> cloudPositions=boardData.getPositions().get(ModelElement.CLOUD.ordinal());
     List<Position> firePositions =boardData.getPositions().get(ModelElement.FIRE.ordinal());
     List<ModelElement> result = new ArrayList<>();
     for (Position firefighterPosition : firefighterPositions)
       if (firefighterPosition.equals(position))
         result.add(ModelElement.FIREFIGHTER);
+    for (Position cloudPosition : cloudPositions)
+      if (cloudPosition.equals(position))
+        result.add(ModelElement.CLOUD);
     if (firePositions.contains(position))
       result.add(ModelElement.FIRE);
     return result;
@@ -81,6 +87,7 @@ public class FFBoard implements Board<List<ModelElement>> {
     modifiedPositions.addAll(updateFires());
     boardData.setStep(boardData.getStep()+1);
     return modifiedPositions;*/
+
     List<Position> modifiedPositions = FFUpdater.updateAll(boardData);
     boardData.setStep(boardData.getStep()+1);
     return modifiedPositions;
@@ -117,24 +124,17 @@ public class FFBoard implements Board<List<ModelElement>> {
 
   @Override
   public void reset() {
-    boardData.setStep(0);
     initializeElements();
   }
 
 
   @Override
   public void setState(List<ModelElement> state, Position position) {
-    List<Position> firefighterPositions = boardData.getPositions().get(ModelElement.FIREFIGHTER.ordinal());
-    List<Position> firePositions = boardData.getPositions().get(ModelElement.FIRE.ordinal());
-    firePositions.remove(position);
-    for (; ; ) {
-      if (!firefighterPositions.remove(position)) break;
-    }
-    for (ModelElement element : state) {
-      switch (element) {
-        case FIRE -> firePositions.add(position);
-        case FIREFIGHTER -> firefighterPositions.add(position);
+    for (ModelElement e:state) {
+        boardData.getPositions().get(e.ordinal()).remove(position);
     }
+    for (ModelElement e:state) {
+      boardData.getPositions().get(e.ordinal()).add(position);
     }
   }
 }
\ No newline at end of file

src/main/java/model/FFBoardData.java

@@ -6,14 +6,31 @@ import java.util.*;
 
 public class FFBoardData implements BoardData{
     private List<List<Position>> positions;
-    private final Map<Position, List<Position>> neighbors = new HashMap<Position, List<Position>>();
+    private Map<Position, List<Position>> neighbors = new HashMap<Position, List<Position>>();
     private int step;
+    private int columnCount,rowCount;
 
-    public FFBoardData() {
+    public FFBoardData(int columnCount, int rowCount) {
+        this.columnCount=columnCount;
+        this.rowCount=rowCount;
         initialize();
     }
     public void initialize(){
         step=0;
+        neighbors = new HashMap<Position, List<Position>>();
+        Position[][] ps = new Position[rowCount][columnCount];
+        for (int column = 0; column < columnCount; column++)
+            for (int row = 0; row < rowCount; row++)
+                ps[row][column] = new Position(row, column);
+        for (int column = 0; column < columnCount; column++)
+            for (int row = 0; row < rowCount; row++) {
+                List<Position> list = new ArrayList<>();
+                if (row > 0) list.add(ps[row - 1][column]);
+                if (column > 0) list.add(ps[row][column - 1]);
+                if (row < rowCount - 1) list.add(ps[row + 1][column]);
+                if (column < columnCount - 1) list.add(ps[row][column + 1]);
+                getNeighbors().put(ps[row][column], list);
+            }
         positions = new ArrayList<>();
         for (int i = 0; i < ModelElement.values().length; i++) {
             positions.add(new ArrayList<>());

src/main/java/model/Fire.java

@@ -16,8 +16,10 @@ public class Fire extends Element{
     public List<Position> Update(BoardData boardData, List<Position> modifPositions) {
         List<Position> firePositions = boardData.getPositions().get(this.type.ordinal());
         List<Position> modifiedPositions = new ArrayList<Position>(modifPositions);
-        List<Position> newFirePositions = behavior.getNext(boardData,firePositions);
+        List<Position> newFirePositions = behavior.getNext(boardData);
+        firePositions.removeAll(newFirePositions);
         firePositions.addAll(newFirePositions);
+        modifiedPositions.removeAll(newFirePositions);
         modifiedPositions.addAll(newFirePositions);
         return modifiedPositions;
     }

src/main/java/model/FireBehavior.java

@@ -13,13 +13,15 @@ public class FireBehavior extends FFBehavior {
     }
 
     @Override
-    public List<Position> getNext(BoardData boardData, List<Position> positions) {
+    public List<Position> getNext(BoardData boardData) {
         List<Position> firePositions = boardData.getPositions().get(element.ordinal());
         List<Position> newFirePositions = new ArrayList<>();
         if (boardData.getStep() % 2 == 0) {
             for (Position fire : firePositions) {
-                boardData.getNeighbors().get(fire).removeAll(newFirePositions);
-                newFirePositions.addAll(boardData.getNeighbors().get(fire));
+                for (Position neighbor:boardData.getNeighbors().get(fire)) {
+                if (!newFirePositions.contains(neighbor))
+                    newFirePositions.add(neighbor);
+                }
             }
         }
         return newFirePositions;

src/main/java/model/FirefighterBehavior.java

@@ -8,7 +8,6 @@ import java.util.List;
 import java.util.ListIterator;
 
 public class FirefighterBehavior extends FFBehavior implements TangibleBehavior<ModelElement>,RemoverBehavior<ModelElement> {
-    ModelElement element;
     List<ModelElement> obstacles=new ArrayList<>(List.of(ModelElement.MOUNTAIN));
     ModelElement removedElement=ModelElement.FIRE;
     TargetStrategy targetStrategy=new TargetStrategy();
@@ -19,27 +18,26 @@ public class FirefighterBehavior extends FFBehavior implements TangibleBehavior<
 
 
     @Override
-    public List<Position> getNext(BoardData boardData, List<Position> modifiedPositions) {
-        List<Position> modifiedPosition = new ArrayList<>();
+    public List<Position> getNext(BoardData boardData) {
         List<Position> firefighterPositions = boardData.getPositions().get(element.ordinal());
-        List<Position> firePositions = boardData.getPositions().get(getElementToRemove().ordinal());
+        List<Position> firePositions = new ArrayList<>(List.copyOf(boardData.getPositions().get(ModelElement.FIRE.ordinal())));
         List<Position> firefighterNewPositions = new ArrayList<>();
         for (Position firefighterPosition : firefighterPositions) {
-            Position newFirefighterPosition =
-                    targetStrategy.neighborClosestToFire(firefighterPosition,
-                            firePositions, boardData.getNeighbors());
+            Position newFirefighterPosition = targetStrategy.neighborClosestToFire(firefighterPosition,firePositions, boardData.getNeighbors());
             firefighterNewPositions.add(newFirefighterPosition);
-            remove(boardData,newFirefighterPosition);
-            modifiedPosition.add(firefighterPosition);
-            modifiedPosition.add(newFirefighterPosition);
-            List<Position> neighborFirePositions = boardData.getNeighbors().get(newFirefighterPosition).stream()
+            firePositions.remove(newFirefighterPosition);
+            firePositions.remove(boardData.getNeighbors().get(newFirefighterPosition));
+        }
+        return firefighterNewPositions;
+    }
+    public List<Position> remove(BoardData boardData,Position p){
+        List<Position> firePositions = boardData.getPositions().get(getElementToRemove().ordinal());
+        List<Position> neighborFirePositions = boardData.getNeighbors().get(p).stream()
                 .filter(firePositions::contains).toList();
+        removePartial(boardData,p);
         for (Position firePosition : neighborFirePositions)
-                remove(boardData,firePosition);
-            modifiedPosition.addAll(neighborFirePositions);
-        }
-        firefighterPositions = firefighterNewPositions;
-        return modifiedPosition;
+            removePartial(boardData,firePosition);
+        return neighborFirePositions;
     }
 
     @Override
@@ -53,7 +51,7 @@ public class FirefighterBehavior extends FFBehavior implements TangibleBehavior<
     }
 
     @Override
-    public void remove(BoardData boardData,Position p) {
+    public void removePartial(BoardData boardData,Position p) {
         List<Position> firePositions = boardData.getPositions().get(getElementToRemove().ordinal());
         firePositions.remove(p);
     }

src/main/java/model/ModelElement.java

@@ -5,6 +5,7 @@ import java.lang.reflect.InvocationTargetException;
 public enum ModelElement {
   FIREFIGHTER(StandardFirefighter.class),
   FIRE(Fire.class),
+  CLOUD(Cloud.class),
   MOUNTAIN(Mountain.class);
 
   public final Class<?> c;

src/main/java/model/NoBehavior.java

@@ -12,8 +12,7 @@ public class NoBehavior extends FFBehavior {
     }
 
     @Override
-    public List<Position> getNext(BoardData boardData, List<Position> positions) {
-        return positions;
+    public List<Position> getNext(BoardData boardData) {
+        return null;
     }
-
 }

src/main/java/model/RemoverBehavior.java

@@ -5,6 +5,8 @@ import util.Position;
 import java.util.List;
 
 public interface RemoverBehavior<E> extends Behavior {
-    public void remove(BoardData boardData,Position p);
+    public void removePartial(BoardData boardData,Position p);
+    public  List<Position> remove(BoardData boardData,Position p);
+
     public E getElementToRemove();
 }

src/main/java/model/StandardFirefighter.java

@@ -26,23 +26,19 @@ public class StandardFirefighter extends Element {
         firePositions.addAll(modifiedList);
         return modifiedList;*/
         List<Position> firefighterPositions = boardData.getPositions().get(type.ordinal());
-        List<Position> firePositions = boardData.getPositions().get(ModelElement.FIRE.ordinal());
-        List<Position> firefighterNewPositions = new ArrayList<>();
-        for (Position firefighterPosition : firefighterPositions) {
-            Position newFirefighterPosition =
-                    targetStrategy.neighborClosestToFire(firefighterPosition,
-                            firePositions, boardData.getNeighbors());
-            firefighterNewPositions.add(newFirefighterPosition);
-            remove(boardData,newFirefighterPosition);
-            modifiedPositions.add(firefighterPosition);
-            modifiedPositions.add(newFirefighterPosition);
-            List<Position> neighborFirePositions = boardData.getNeighbors().get(newFirefighterPosition).stream()
-                    .filter(firePositions::contains).toList();
-            for (Position firePosition : neighborFirePositions)
-                remove(boardData,firePosition);
-            modifiedPositions.addAll(neighborFirePositions);
+        List<Position> firefighterNewPositions = behavior.getNext(boardData);
+        List<Position> neighborFirePositions = new ArrayList<>();
+
+        modifiedPositions.removeAll(firefighterPositions);
+        modifiedPositions.removeAll(firefighterNewPositions);
+        modifiedPositions.addAll(firefighterPositions);
+        modifiedPositions.addAll(firefighterNewPositions);
+        for (Position p :firefighterNewPositions) {
+            neighborFirePositions.addAll(((RemoverBehavior)behavior).remove(boardData,p));
         }
-        firefighterPositions = firefighterNewPositions;
+        modifiedPositions.removeAll(neighborFirePositions);
+        modifiedPositions.addAll(neighborFirePositions);
+        boardData.getPositions().set(type.ordinal(),firefighterNewPositions);
         return modifiedPositions;
     }
 

src/main/java/view/ViewElement.java

@@ -3,7 +3,7 @@ package view;
 import javafx.scene.paint.Color;
 
 public enum ViewElement {
-  FIREFIGHTER(Color.BLUE), FIRE(Color.RED),MOUNTAIN(Color.BROWN) , EMPTY(Color.WHITE);
+  FIREFIGHTER(Color.BLUE), FIRE(Color.RED),CLOUD(Color.GRAY) ,MOUNTAIN(Color.BROWN) , EMPTY(Color.WHITE);
   final Color color;
   ViewElement(Color color) {
     this.color = color;