From d3558510ede5b442b9cf43101793ffc6f5e8ee0d Mon Sep 17 00:00:00 2001
From: ousseyn01 <ousseyn.ndiaye9@gmail.com>
Date: Wed, 27 Nov 2024 11:40:19 +0100
Subject: [PATCH] Implementation of fire in order to stop when fire is in next
to MOUNTAIN
---
src/main/java/model/Fire.java | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/main/java/model/Fire.java b/src/main/java/model/Fire.java
index 159e2e3..0541ba0 100644
--- a/src/main/java/model/Fire.java
+++ b/src/main/java/model/Fire.java
@@ -21,7 +21,7 @@ public class Fire {
return firePositions;
}
- public List<Position> spreadFire() {
+ /*public List<Position> spreadFire() {
List<Position> modifiedPositions = new ArrayList<>();
List<Position> newFirePositions = new ArrayList<>();
@@ -31,6 +31,18 @@ public class Fire {
firePositions.addAll(newFirePositions);
modifiedPositions.addAll(newFirePositions);
return newFirePositions;
+ }*/
+ public List<Position> spreadFire(Set<Position> mountains) {
+ List<Position> newFires = new ArrayList<>();
+ for (Position firePosition : firePositions) {
+ for (Position neighbor : neighbors.get(firePosition)) {
+ if (!mountains.contains(neighbor) && !firePositions.contains(neighbor)) {
+ newFires.add(neighbor);
+ }
+ }
+ }
+ firePositions.addAll(newFires);
+ return newFires;
}
public void extinguishFire(Position neighbor) {
--
GitLab