From c53f2883ac566b6de1665cabb645694ed4129eca Mon Sep 17 00:00:00 2001
From: a22021617 <mohamed.asfour@etu.univ-amu.fr>
Date: Fri, 8 Nov 2024 11:51:46 +0100
Subject: [PATCH] il nous reste que 5 erreur et c'est au niveau de
updateFireFighters
---
src/main/java/model/FirefighterBoard.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/model/FirefighterBoard.java b/src/main/java/model/FirefighterBoard.java
index 4c674b7..92a18ec 100644
--- a/src/main/java/model/FirefighterBoard.java
+++ b/src/main/java/model/FirefighterBoard.java
@@ -113,7 +113,7 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
firePositions, neighbors);
firefighterNewPositions.add(newFirefighterPosition);
extinguish(newFirefighterPosition);
- modifiedPosition.add(firefighterPosition);
+ modifiedPosition.add(firefighterPosition.getFirefighterPosition());
modifiedPosition.add(newFirefighterPosition);
List<Position> neighborFirePositions = neighbors.get(newFirefighterPosition).stream()
.filter(firePositions::contains).toList();
@@ -132,20 +132,20 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
}
private void extinguish(Position position) {
- firePositions.remove(position);
+ fire.remove(position);
}
@Override
public void setState(List<ModelElement> state, Position position) {
- firePositions.remove(position);
+ extinguish(position);
for (; ; ) {
- if (!firefighterPositions.remove(position)) break;
+ if (!firefighterPostion.remove(position)) break;
}
for (ModelElement element : state) {
switch (element) {
- case FIRE -> firePositions.add(position);
- case FIREFIGHTER -> firefighterPositions.add(position);
+ case FIRE -> fire.add(new Fire(position));
+ case FIREFIGHTER -> firefighter.add(new FireFighter(position));
}
}
}
--
GitLab