From e90516964ea3519a860b315ebef8f50f5e84fddc Mon Sep 17 00:00:00 2001
From: ousseyn01 <ousseyn.ndiaye9@gmail.com>
Date: Fri, 29 Nov 2024 09:45:08 +0100
Subject: [PATCH] No change
---
src/main/java/model/Fire.java | 11 -----------
src/main/java/model/Firefighter.java | 4 +++-
src/main/java/model/FirefighterBoard.java | 2 --
3 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/src/main/java/model/Fire.java b/src/main/java/model/Fire.java
index 0541ba0..8540201 100644
--- a/src/main/java/model/Fire.java
+++ b/src/main/java/model/Fire.java
@@ -21,17 +21,6 @@ public class Fire {
return firePositions;
}
- /*public List<Position> spreadFire() {
- List<Position> modifiedPositions = new ArrayList<>();
-
- List<Position> newFirePositions = new ArrayList<>();
- for (Position fire : firePositions) {
- newFirePositions.addAll(neighbors.get(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) {
diff --git a/src/main/java/model/Firefighter.java b/src/main/java/model/Firefighter.java
index 0411168..3b93fda 100644
--- a/src/main/java/model/Firefighter.java
+++ b/src/main/java/model/Firefighter.java
@@ -7,7 +7,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-public class Firefighter {
+public class Firefighter implements BoardElement {
private Position position;
public Firefighter(Position position) {
@@ -16,10 +16,12 @@ public class Firefighter {
//this.neighbors = neighbors;
}
+ @Override
public Position getPosition() {
return position;
}
+ @Override
public void setPosition(Position position) {
this.position = position;
}
diff --git a/src/main/java/model/FirefighterBoard.java b/src/main/java/model/FirefighterBoard.java
index b5785cf..353e064 100644
--- a/src/main/java/model/FirefighterBoard.java
+++ b/src/main/java/model/FirefighterBoard.java
@@ -124,8 +124,6 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
modifiedPositions.addAll(fire.spreadFire(getMountainPositions()));
}
for (Cloud cloud : clouds) {
- //cloud.moveAndExtinguishFire(fire);
- //cloud.extinguishFireCloud(fire);
cloud.move();
cloud.protectFromFire(fire);
cloud.extinguishSurroundingFires(fire);
--
GitLab