From 05895e3b40fcf636f66b647c2f0c5ad0a2e65a08 Mon Sep 17 00:00:00 2001
From: a22021617 <mohamed.asfour@etu.univ-amu.fr>
Date: Fri, 8 Nov 2024 11:10:07 +0100
Subject: [PATCH] rajout des getter et setter dans FireFighter et Fire A.M
---
src/main/java/model/Fire.java | 7 +++++++
src/main/java/model/FireFighter.java | 7 +++++++
src/main/java/model/FirefighterBoard.java | 10 +++++-----
3 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/main/java/model/Fire.java b/src/main/java/model/Fire.java
index 4e4693f..52ca655 100644
--- a/src/main/java/model/Fire.java
+++ b/src/main/java/model/Fire.java
@@ -10,4 +10,11 @@ public class Fire {
public Fire(Position position){
this.firePositions = position;
}
+ public Position getFirePositions(){
+ return this.firePositions;
+
+ }
+ public void setFirePositions(Position firePositions){
+ this.firePositions = firePositions;
+ }
}
diff --git a/src/main/java/model/FireFighter.java b/src/main/java/model/FireFighter.java
index bd80252..96ccf72 100644
--- a/src/main/java/model/FireFighter.java
+++ b/src/main/java/model/FireFighter.java
@@ -10,6 +10,13 @@ public class FireFighter {
public FireFighter(Position firefighterPositions) {
this.firefighterPositions = firefighterPositions;
+
}
+ public void setFirefighterPositions(Position firefighterPositions) {
+ this.firefighterPositions = firefighterPositions;
+ }
+ public Position getFirefighterPositions() {
+ return firefighterPositions;
+ }
}
diff --git a/src/main/java/model/FirefighterBoard.java b/src/main/java/model/FirefighterBoard.java
index 9c55246..b0f46a9 100644
--- a/src/main/java/model/FirefighterBoard.java
+++ b/src/main/java/model/FirefighterBoard.java
@@ -43,9 +43,9 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
firefighter= new ArrayList<>();
fire = new HashSet<>();
for (int index = 0; index < initialFireCount; index++)
- fire.add(randomPosition());
+ fire.add(new Fire(randomPosition()));
for (int index = 0; index < initialFirefighterCount; index++)
- firefighter.add(randomPosition());
+ firefighter.add(new FireFighter(randomPosition()));
}
private Position randomPosition() {
@@ -55,10 +55,10 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
@Override
public List<ModelElement> getState(Position position) {
List<ModelElement> result = new ArrayList<>();
- for (Position firefighterPosition : firefighterPositions)
- if (firefighterPosition.equals(position))
+ for (FireFighter firefighter : firefighter)
+ if (firefighter.getFirefighterPositions().equals(position))
result.add(ModelElement.FIREFIGHTER);
- if (firePositions.contains(position))
+ if (fire.contains(position))
result.add(ModelElement.FIRE);
return result;
}
--
GitLab