From cb4d18d9173d8bc03256f94d2dcb2f742a09e6b6 Mon Sep 17 00:00:00 2001
From: ousseyn01 <ousseyn.ndiaye9@gmail.com>
Date: Wed, 27 Nov 2024 11:41:39 +0100
Subject: [PATCH] Implementation of methods for apply those methods
---
src/main/java/model/FirefighterBoard.java | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/model/FirefighterBoard.java b/src/main/java/model/FirefighterBoard.java
index 6ad3f72..e6849c6 100644
--- a/src/main/java/model/FirefighterBoard.java
+++ b/src/main/java/model/FirefighterBoard.java
@@ -121,7 +121,7 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
public List<Position> updateToNextGeneration() {
List<Position> modifiedPositions = updateFirefighters();
if (step % 2 == 0){
- modifiedPositions.addAll(fire.spreadFire());
+ modifiedPositions.addAll(fire.spreadFire(getMountainPositions()));
}
// Déplacer les nuages et éteindre les feux
for (Cloud cloud : clouds) {
@@ -132,6 +132,13 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
return modifiedPositions;
}
+ private Set<Position> getMountainPositions() {
+ Set<Position> mountainPositions = new HashSet<>();
+ for (Mountain mountain : mountains) {
+ mountainPositions.add(mountain.getPosition());
+ }
+ return mountainPositions;
+ }
@Override
public int stepNumber() {
@@ -144,7 +151,7 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
modifiedPosition.add(firefighter.getPosition());
- Position newPosition = firefighter.moveToBestPosition(targetStrategy, fire.getFirePositions(), neighbors);
+ Position newPosition = firefighter.moveToBestPosition(fire.getFirePositions(), neighbors, getMountainPositions());
firefighter.setPosition(newPosition);
modifiedPosition.add(newPosition);
--
GitLab