From 3e4b0ab5082b591ddeba57ffcf4c7ebc055c0c9d Mon Sep 17 00:00:00 2001
From: b22015516 <mehdi.belhachemi@etu.univ-amu.fr>
Date: Fri, 8 Nov 2024 11:02:25 +0100
Subject: [PATCH] mehdi : modifiying initializeElements() method
---
src/main/java/model/Fire.java | 14 ++++++++++++--
src/main/java/model/FireFighter.java | 15 +++++++++++++--
src/main/java/model/FirefighterBoard.java | 16 +++++++++++-----
3 files changed, 36 insertions(+), 9 deletions(-)
diff --git a/src/main/java/model/Fire.java b/src/main/java/model/Fire.java
index e0de112..16cc169 100644
--- a/src/main/java/model/Fire.java
+++ b/src/main/java/model/Fire.java
@@ -5,6 +5,16 @@ import util.Position;
import java.util.Set;
public class Fire {
- private final int initialFireCount;
- private Set<Position> firePositions;
+
+ private Position firePositions;
+
+ public Fire(Position position){
+ this.firePositions = position;
+ }
+
+ public void setFirePosition(Position postion){
+ this.firePositions = postion;
+ }
+
+
}
diff --git a/src/main/java/model/FireFighter.java b/src/main/java/model/FireFighter.java
index d8bdf88..b377c42 100644
--- a/src/main/java/model/FireFighter.java
+++ b/src/main/java/model/FireFighter.java
@@ -6,7 +6,18 @@ import java.util.List;
public class FireFighter {
- private final int initialFirefighterCount;
- private List<Position> firefighterPositions;
+
+ private Position FireFighterPosition;
+
+ public FireFighter(Position position){
+ this.FireFighterPosition = position;
+ }
+
+
+ public void setFireFighterPosition(Position postion){
+ this.FireFighterPosition = postion;
+ }
+
+
}
diff --git a/src/main/java/model/FirefighterBoard.java b/src/main/java/model/FirefighterBoard.java
index f324d7d..94e52d5 100644
--- a/src/main/java/model/FirefighterBoard.java
+++ b/src/main/java/model/FirefighterBoard.java
@@ -8,6 +8,10 @@ import java.util.*;
public class FirefighterBoard implements Board<List<ModelElement>> {
private final int columnCount;
private final int rowCount;
+ private final int initialFirefighterCount;
+ private final int initialFireCount;
+ private List<FireFighter> firefighter;
+ private Set<Fire> fire;
private final TargetStrategy targetStrategy = new TargetStrategy();
private Map<Position, List<Position>> neighbors = new HashMap();
private final Position[][] positions;
@@ -36,12 +40,14 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
}
public void initializeElements() {
- firefighterPositions = new ArrayList<>();
- firePositions = new HashSet<>();
- for (int index = 0; index < initialFireCount; index++)
- firePositions.add(randomPosition());
+ firefighter = new ArrayList<>();
+ fire = new HashSet<>();
+ for (int index = 0; index < initialFireCount; index++){
+ fire.add(new Fire(randomPosition()));
+ }
+
for (int index = 0; index < initialFirefighterCount; index++)
- firefighterPositions.add(randomPosition());
+ firefighter.add(new FireFighter(randomPosition()));
}
private Position randomPosition() {
--
GitLab