From 8fc54d7563b6a5f4fba918c684151446233af1fd Mon Sep 17 00:00:00 2001
From: b22015516 <mehdi.belhachemi@etu.univ-amu.fr>
Date: Fri, 8 Nov 2024 11:15:27 +0100
Subject: [PATCH] mehdi : modifiying initializeElements() method
---
src/main/java/model/Fire.java | 4 +++-
src/main/java/model/FireFighter.java | 5 +++--
src/main/java/model/FirefighterBoard.java | 14 +++++++++-----
3 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/main/java/model/Fire.java b/src/main/java/model/Fire.java
index 16cc169..648fdf7 100644
--- a/src/main/java/model/Fire.java
+++ b/src/main/java/model/Fire.java
@@ -16,5 +16,7 @@ public class Fire {
this.firePositions = postion;
}
-
+ public Position getFirePosition() {
+ return firePositions;
+ }
}
diff --git a/src/main/java/model/FireFighter.java b/src/main/java/model/FireFighter.java
index b377c42..96d9f7f 100644
--- a/src/main/java/model/FireFighter.java
+++ b/src/main/java/model/FireFighter.java
@@ -18,6 +18,7 @@ public class FireFighter {
this.FireFighterPosition = postion;
}
-
-
+ public Position getFireFighterPosition() {
+ return FireFighterPosition;
+ }
}
diff --git a/src/main/java/model/FirefighterBoard.java b/src/main/java/model/FirefighterBoard.java
index 94e52d5..5627c7c 100644
--- a/src/main/java/model/FirefighterBoard.java
+++ b/src/main/java/model/FirefighterBoard.java
@@ -57,11 +57,15 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
@Override
public List<ModelElement> getState(Position position) {
List<ModelElement> result = new ArrayList<>();
- for (Position firefighterPosition : firefighterPositions)
- if (firefighterPosition.equals(position))
+ for (FireFighter firefighter : firefighter)
+ if (firefighter.getFireFighterPosition().equals(position))
result.add(ModelElement.FIREFIGHTER);
- if (firePositions.contains(position))
- result.add(ModelElement.FIRE);
+
+ for(Fire fire : fire){
+ if(fire.getFirePosition().equals(position)){
+ result.add(ModelElement.FIRE);
+ }
+ }
return result;
}
@@ -86,7 +90,7 @@ 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 : fires) {
newFirePositions.addAll(neighbors.get(fire));
}
firePositions.addAll(newFirePositions);
--
GitLab