cloud REWORKED

Mountain DONE

src/main/java/controller/Controller.java

@@ -96,22 +96,14 @@ public class Controller {
       for(int row = 0; row < rowCount; row++)
         viewElements[row][column] = getViewElement(board.getState(new Position(row, column)));
     grid.repaint(viewElements);
-    System.out.println(toString(viewElements));
     updateGenerationLabel(board.stepNumber());
   }
 
   private ViewElement getViewElement(List<ModelElement> squareState) {
-    if (squareState.contains(ModelElement.FIRE)){
-    return ViewElement.FIRE;
+    for (ModelElement element:ModelElement.values()) {
+        if (squareState.contains(element)){
+        return ViewElement.values()[element.ordinal()];
       }
-    if(squareState.contains(ModelElement.FIREFIGHTER)){
-      return ViewElement.FIREFIGHTER;
-    }
-    if(squareState.contains(ModelElement.CLOUD)){
-      return ViewElement.CLOUD;
-    }
-    if (squareState.contains(ModelElement.MOUNTAIN)){
-      return ViewElement.MOUNTAIN;
     }
     return ViewElement.EMPTY;
   }

src/main/java/model/Behavior.java

@@ -3,10 +3,9 @@ package model;
 import util.Position;
 
 import java.util.List;
+import java.util.Map;
 
 public interface Behavior {
     public List<Position> getNext(BoardData boardData);
-    public default Boolean isLegalMove(){
-        return true;
-    }
+    public Map<Position,List<Position>> legalNeighbors(BoardData boardData);
 }
\ No newline at end of file

src/main/java/model/CloudBehavior.java

@@ -6,12 +6,11 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
-public class CloudBehavior implements RemoverBehavior<ModelElement> {
-    private ModelElement element;
-    private ModelElement removedElement=ModelElement.FIRE;
-    private Random random=new Random();
+public class CloudBehavior extends FFBehavior implements RemoverBehavior<ModelElement> {
+    private final ModelElement removedElement=ModelElement.FIRE;
+    private final Random random=new Random();
     public CloudBehavior(ModelElement modelElement) {
-        this.element=modelElement;
+        super(ModelElement.CLOUD);
     }
 
     @Override

src/main/java/model/FFBehavior.java

 package model;
 
+import util.Position;
+
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 public abstract class FFBehavior implements Behavior {
     public ModelElement element;
     public FFBehavior(ModelElement element) {
         this.element = element;
     }
+
+    @Override
+    public Map<Position, List<Position>> legalNeighbors(BoardData boardData) {
+        Map<Position,List<Position>> neighbors=new HashMap<>();
+        for (Map.Entry<Position,List<Position>> entry: boardData.getNeighbors().entrySet()) {
+                neighbors.put(entry.getKey(),new ArrayList<Position>(List.copyOf(entry.getValue())));
+        }
+        return neighbors;
+    }
 }
\ No newline at end of file

src/main/java/model/FFBoard.java

@@ -45,10 +45,13 @@ public class FFBoard implements Board<List<ModelElement>> {
     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());
+    for (int index = 0; index < 10; index++)
+      boardData.getPositions().get(ModelElement.CLOUD.ordinal()).add(randomPosition());
+    for (int index = 0; index < 50; index++)
+      boardData.getPositions().get(ModelElement.MOUNTAIN.ordinal()).add(randomPosition());
+
   }
 
   private Position randomPosition() {
@@ -57,18 +60,12 @@ 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);
+    for (ModelElement e:ModelElement.values()) {
+      for (Position p : boardData.getPositions().get(e.ordinal()))
+        if (p.equals(position))
+          result.add(e);
+    }
     return result;
   }
 
@@ -83,10 +80,6 @@ public class FFBoard implements Board<List<ModelElement>> {
   }
 
   public List<Position> updateToNextGeneration() {
-    /*List<Position> modifiedPositions = updateFirefighters();
-    modifiedPositions.addAll(updateFires());
-    boardData.setStep(boardData.getStep()+1);
-    return modifiedPositions;*/
 
     List<Position> modifiedPositions = FFUpdater.updateAll(boardData);
     boardData.setStep(boardData.getStep()+1);
@@ -99,8 +92,8 @@ public class FFBoard implements Board<List<ModelElement>> {
     return boardData.getStep();
   }
 
-  private List<Position> updateFirefighters() {
-    List<Position> modifiedPosition = new ArrayList<>();/*
+  /*private List<Position> updateFirefighters() {
+    List<Position> modifiedPosition = new ArrayList<>();
     List<Position> firefighterPositions = boardData.getPositions().get(ModelElement.FIREFIGHTER.ordinal());
     List<Position> firePositions = boardData.getPositions().get(ModelElement.FIRE.ordinal());
     List<Position> firefighterNewPositions = new ArrayList<>();
@@ -118,9 +111,9 @@ public class FFBoard implements Board<List<ModelElement>> {
         extinguish(firePosition);
       modifiedPosition.addAll(neighborFirePositions);
     }
-    firefighterPositions = firefighterNewPositions;*/
+    firefighterPositions = firefighterNewPositions;
     return modifiedPosition;
-  }
+  }*/
 
   @Override
   public void reset() {
@@ -130,7 +123,7 @@ public class FFBoard implements Board<List<ModelElement>> {
 
   @Override
   public void setState(List<ModelElement> state, Position position) {
-    for (ModelElement e:state) {
+    for (ModelElement e:ModelElement.values()) {
         boardData.getPositions().get(e.ordinal()).remove(position);
     }
     for (ModelElement e:state) {

src/main/java/model/FFUpdater.java

@@ -20,7 +20,6 @@ public class FFUpdater implements Updater {
         List<Position> modifiedList=new ArrayList<Position>();
         for (int i = 0; i < ModelElement.values().length; i++) {
             modifiedList=this.elements[i].Update(boardData,modifiedList);
-            System.out.println(modifiedList.toString());
         }
         return modifiedList;
     }

src/main/java/model/FireBehavior.java

@@ -4,9 +4,10 @@ import util.Position;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
-public class FireBehavior extends FFBehavior {
-
+public class FireBehavior extends FFBehavior implements TangibleBehavior<ModelElement> {
+    private List<ModelElement> obstacles=List.of(ModelElement.MOUNTAIN);
 
     public FireBehavior(ModelElement element) {
         super(element);
@@ -18,7 +19,7 @@ public class FireBehavior extends FFBehavior {
         List<Position> newFirePositions = new ArrayList<>();
         if (boardData.getStep() % 2 == 0) {
             for (Position fire : firePositions) {
-                for (Position neighbor:boardData.getNeighbors().get(fire)) {
+                for (Position neighbor:legalNeighbors(boardData).get(fire)) {
                 if (!newFirePositions.contains(neighbor))
                     newFirePositions.add(neighbor);
                 }
@@ -26,4 +27,20 @@ public class FireBehavior extends FFBehavior {
         }
         return newFirePositions;
     }
+
+    @Override
+    public List<ModelElement> getObstacles() {
+        return obstacles;
+    }
+
+    @Override
+    public Map<Position, List<Position>> legalNeighbors(BoardData boardData) {
+        Map<Position,List<Position>> neigbors= super.legalNeighbors(boardData);
+        for (Map.Entry<Position,List<Position>> entry: neigbors.entrySet()) {
+            for (ModelElement e:getObstacles()) {
+                entry.getValue().removeAll(boardData.getPositions().get(e.ordinal()));
+            }
+        }
+        return neigbors;
+    }
 }

src/main/java/model/FirefighterBehavior.java

@@ -3,12 +3,10 @@ package model;
 import util.Position;
 import util.TargetStrategy;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ListIterator;
+import java.util.*;
 
 public class FirefighterBehavior extends FFBehavior implements TangibleBehavior<ModelElement>,RemoverBehavior<ModelElement> {
-    List<ModelElement> obstacles=new ArrayList<>(List.of(ModelElement.MOUNTAIN));
+    List<ModelElement> obstacles=List.of(ModelElement.MOUNTAIN);
     ModelElement removedElement=ModelElement.FIRE;
     TargetStrategy targetStrategy=new TargetStrategy();
 
@@ -22,8 +20,9 @@ public class FirefighterBehavior extends FFBehavior implements TangibleBehavior<
         List<Position> firefighterPositions = boardData.getPositions().get(element.ordinal());
         List<Position> firePositions = new ArrayList<>(List.copyOf(boardData.getPositions().get(ModelElement.FIRE.ordinal())));
         List<Position> firefighterNewPositions = new ArrayList<>();
+        Map<Position,List<Position>> neigbours=legalNeighbors(boardData);
         for (Position firefighterPosition : firefighterPositions) {
-            Position newFirefighterPosition = targetStrategy.neighborClosestToFire(firefighterPosition,firePositions, boardData.getNeighbors());
+            Position newFirefighterPosition = targetStrategy.neighborClosestToFire(firefighterPosition,firePositions, neigbours);
             firefighterNewPositions.add(newFirefighterPosition);
             firePositions.remove(newFirefighterPosition);
             firePositions.remove(boardData.getNeighbors().get(newFirefighterPosition));
@@ -40,10 +39,6 @@ public class FirefighterBehavior extends FFBehavior implements TangibleBehavior<
         return neighborFirePositions;
     }
 
-    @Override
-    public Boolean isLegalMove() {
-        return super.isLegalMove();
-    }
 
     @Override
     public List<ModelElement> getObstacles() {
@@ -56,6 +51,17 @@ public class FirefighterBehavior extends FFBehavior implements TangibleBehavior<
         firePositions.remove(p);
     }
 
+    @Override
+    public Map<Position, List<Position>> legalNeighbors(BoardData boardData) {
+        Map<Position,List<Position>> neigbours= Map.copyOf(super.legalNeighbors(boardData));
+        for (Map.Entry<Position,List<Position>> entry: neigbours.entrySet()) {
+            for (ModelElement e:getObstacles()) {
+                entry.getValue().removeAll(boardData.getPositions().get(e.ordinal()));
+            }
+        }
+        return neigbours;
+    }
+
     @Override
     public ModelElement getElementToRemove() {
         return removedElement;

src/main/java/model/ModelElement.java

@@ -3,6 +3,8 @@ package model;
 import java.lang.reflect.InvocationTargetException;
 
 public enum ModelElement {
+
+
   FIREFIGHTER(StandardFirefighter.class),
   FIRE(Fire.class),
   CLOUD(Cloud.class),

src/main/java/model/RemoverBehavior.java

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

src/main/java/model/StandardFirefighter.java

@@ -17,14 +17,6 @@ public class StandardFirefighter extends Element {
 
     @Override
     public List<Position> Update(BoardData boardData, List<Position> modifiedPositions) {
-        /*
-        List<Position> firefighterPositions = boardData.getPositions().get(ModelElement.FIREFIGHTER.ordinal());
-        List<Position> firePositions = boardData.getPositions().get(ModelElement.FIRE.ordinal());
-        modifiedList =behavior.getNext(boardData,modifiedList);
-        firePositions.removeAll(modifiedList);
-        firefighterPositions.removeAll(modifiedList);
-        firePositions.addAll(modifiedList);
-        return modifiedList;*/
         List<Position> firefighterPositions = boardData.getPositions().get(type.ordinal());
         List<Position> firefighterNewPositions = behavior.getNext(boardData);
         List<Position> neighborFirePositions = new ArrayList<>();

src/main/java/model/TangibleBehavior.java

 package model;
 
+import util.Position;
+
 import java.util.List;
 
 public interface TangibleBehavior<E> extends Behavior {
     public List<E> getObstacles();
+
 }