From 6fd1e3d1fc4ebd7dd9bf492ae204ca3d1e5aca09 Mon Sep 17 00:00:00 2001
From: ousseyn01 <ousseyn.ndiaye9@gmail.com>
Date: Thu, 5 Dec 2024 20:49:57 +0100
Subject: [PATCH] no change
---
src/main/java/model/Firefighter.java | 4 ++++
src/main/java/model/FirefighterBoard.java | 23 +++++++++++++++++++----
2 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/src/main/java/model/Firefighter.java b/src/main/java/model/Firefighter.java
index 43fc7e5..5b1e562 100644
--- a/src/main/java/model/Firefighter.java
+++ b/src/main/java/model/Firefighter.java
@@ -43,4 +43,8 @@ public class Firefighter {
public void extinguish(Position position, Set<Position> firePositions) {
firePositions.remove(position);
}
+ public void reset(Position initialPosition) {
+ this.position = initialPosition;
+ }
+
}
diff --git a/src/main/java/model/FirefighterBoard.java b/src/main/java/model/FirefighterBoard.java
index 7c1960c..65c2226 100644
--- a/src/main/java/model/FirefighterBoard.java
+++ b/src/main/java/model/FirefighterBoard.java
@@ -48,7 +48,6 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
this.initialCloudCount = initialCloudCount;
initializeElements();
- // Initialisation des Updaters
nextGenerationUpdater = new NextGenerationUpdater(fire, clouds, firefighters, mountains, neighbors);
terrainElements = new ArrayList<>();
@@ -68,7 +67,16 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
clouds = new ArrayList<>();
mountains = new ArrayList<>();
Set<Position> firePositions = new HashSet<>();
+ terrainElements = new ArrayList<>();
+
+ // List<Position> initialFirefighterPositions = new ArrayList<>();
+ int targetColumn = 9;
+
+ for (int row = 0; row < rowCount; row++) {
+ Position position = new Position(row, targetColumn);
+ terrainElements.add(new Route(position));
+ }
for (int index = 0; index < initialCloudCount; index++) {
clouds.add(new Cloud(randomPosition(), neighbors));
@@ -76,8 +84,11 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
for (int index = 0; index < initialFireCount; index++)
firePositions.add(randomPosition());
fire = new Fire(firePositions, neighbors);
- for (int index = 0; index < initialFirefighterCount; index++)
+
+ for (int index = 0; index < initialFirefighterCount; index++) {
firefighters.add(new Firefighter(randomPosition()));
+ }
+
for (int index = 0; index < initialCloudCount; index++) {
clouds.add(new Cloud(randomPosition(), neighbors));
}
@@ -155,13 +166,17 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
}
public List<Position> updateToNextGeneration() {
- return nextGenerationUpdater.updateToNextGeneration();
+ List<Position> updatedPositions = nextGenerationUpdater.updateToNextGeneration();
+ step++; // Incrémentation du compteur de génération
+ return updatedPositions;
+ //return nextGenerationUpdater.updateToNextGeneration();
}
@Override
public void reset() {
- nextGenerationUpdater.resetStep();
initializeElements();
+ nextGenerationUpdater.resetStep();
+
}
@Override
--
GitLab