From 48220ee051e1d7c20701cd6216ebdf842dd673fb Mon Sep 17 00:00:00 2001
From: m23022217 <ilyas.maazouz@etu.univ-amu.fr>
Date: Thu, 23 Nov 2023 13:57:02 +0100
Subject: [PATCH] hjklh
---
src/main/java/model/ModelElement.java | 2 +-
src/main/java/newmodel/Fboard.java | 15 +++++++--------
src/main/java/newmodel/Fire.java | 2 +-
src/main/java/newmodel/FireFighter.java | 2 +-
4 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/main/java/model/ModelElement.java b/src/main/java/model/ModelElement.java
index fa0297c..84c7810 100644
--- a/src/main/java/model/ModelElement.java
+++ b/src/main/java/model/ModelElement.java
@@ -2,5 +2,5 @@ package model;
//this class represents two types of constant Firefighter or fire
public enum ModelElement {
- FIREFIGHTER, FIRE ,
+ FIREFIGHTER, FIRE ,NOT
}
diff --git a/src/main/java/newmodel/Fboard.java b/src/main/java/newmodel/Fboard.java
index 853728f..efd4721 100644
--- a/src/main/java/newmodel/Fboard.java
+++ b/src/main/java/newmodel/Fboard.java
@@ -36,9 +36,11 @@ public class Fboard {
}
}
for(item item : items){
+ // Remove Extinguished position from the results
if(item.getID()==0){
result.addAll(item.update(this));
}
+
}
step++;
return result;
@@ -64,15 +66,15 @@ public class Fboard {
}
}
+ // A revoir
public Fire getFire() {
Fire x = null;
for (item e : items) {
if (e.getID() == 1) {
- x = (Fire) e;
- break;
+ return (Fire) e;
}
}
- return x;
+ return (Fire) items.get(0);
}
public List<Position> neighbors(Position position) {
List<Position> list = new ArrayList<>();
@@ -103,17 +105,14 @@ public class Fboard {
return position;
}
-
+// A revoir
public List<ModelElement> getState(Position position){
List<ModelElement> result = new ArrayList<>();
for (item e :items) {
if (e.getPositions().contains(position) && e.getID() == 1) {
result.add(e.getState());
}
- }
-
- for (item e :items) {
- if (e.getPositions().contains(position) && e.getID() == 0) {
+ if (e.getPositions().contains(position) && e.getID() == 0) {
result.add(e.getState());
}
}
diff --git a/src/main/java/newmodel/Fire.java b/src/main/java/newmodel/Fire.java
index 5bf9ef0..b9cfad7 100644
--- a/src/main/java/newmodel/Fire.java
+++ b/src/main/java/newmodel/Fire.java
@@ -10,7 +10,7 @@ public class Fire implements item {
private final int initialFireCount;
private List<Position> firePositions;
- private final ModelElement state;
+ private ModelElement state;
private final Random randomGenerator = new Random();
private final int ID=1;
diff --git a/src/main/java/newmodel/FireFighter.java b/src/main/java/newmodel/FireFighter.java
index 2ca97a8..91a74d3 100644
--- a/src/main/java/newmodel/FireFighter.java
+++ b/src/main/java/newmodel/FireFighter.java
@@ -7,7 +7,7 @@ import java.util.Random;
public class FireFighter extends Extinguisher {
- private final ModelElement state;
+ private ModelElement state;
private List<Position> firefighterPositions;
private final Random randomGenerator = new Random();
--
GitLab