From 54d37d87d2ded966e0352248b3c32af6324f2268 Mon Sep 17 00:00:00 2001
From: Celia AREZKI <celia.arezki.1@etu.univ-amu.fr>
Date: Sun, 17 Nov 2024 20:50:32 +0100
Subject: [PATCH] FirefighterBoard : modify the methode updateFires
---
src/main/java/model/FirefighterBoard.java | 25 +++++++++--------------
1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/src/main/java/model/FirefighterBoard.java b/src/main/java/model/FirefighterBoard.java
index 6613e47..bf5d053 100644
--- a/src/main/java/model/FirefighterBoard.java
+++ b/src/main/java/model/FirefighterBoard.java
@@ -59,12 +59,16 @@ 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());
- for (int index = 0; index < initialFirefighterCount; index++)
+ // Initialize fires
+ fireManager.initializeFires(initialFireCount, rowCount, columnCount, randomGenerator);
+
+ // Initialize firefighters
+ List<Position> firefighterPositions = new ArrayList<>();
+ for (int index = 0; index < initialFirefighterCount; index++) {
firefighterPositions.add(randomPosition());
+ }
+ firefighterManager.getFirefighterPositions().clear();
+ firefighterManager.getFirefighterPositions().addAll(firefighterPositions);
}
private Position randomPosition() {
@@ -100,16 +104,7 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
}
private List<Position> updateFires() {
- List<Position> modifiedPositions = new ArrayList<>();
- if (step % 2 == 0) {
- List<Position> newFirePositions = new ArrayList<>();
- for (Position fire : firePositions) {
- newFirePositions.addAll(neighbors.get(fire));
- }
- firePositions.addAll(newFirePositions);
- modifiedPositions.addAll(newFirePositions);
- }
- return modifiedPositions;
+ return fireManager.updateFires(step,neighbors);
}
--
GitLab