From d05cd6898b5363fab535f690c2f717b1ab2517c5 Mon Sep 17 00:00:00 2001
From: p20006624 <linh.PHAM-THI-NGOC.1@etu.univ-amu.fr>
Date: Thu, 23 Nov 2023 17:19:28 +0100
Subject: [PATCH] method in element
---
src/main/java/model/Element.java | 9 ++++-----
src/main/java/model/FireFighter.java | 6 +++++-
src/main/java/model/FirefighterBoard.java | 1 +
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/main/java/model/Element.java b/src/main/java/model/Element.java
index c1997df..5ef68d7 100644
--- a/src/main/java/model/Element.java
+++ b/src/main/java/model/Element.java
@@ -7,18 +7,17 @@ import java.util.Random;
public abstract class Element {
protected Position position;
- public void initializeElements() {}
+
private Position randomPosition() {}
- public List<ModelElement> getState(Position position) {}
+ public List<State> getState(Position position) {}//????????????
public List<Position> updateToNextGeneration() {}
- private List<Position> updateFires() {}
private List<Position> neighbors(Position position) {}
private Position neighborClosestToFire(Position position) {}
- public void setState(List<ModelElement> state, Position position) {}
+
private List<Position> updatePosition();
private List<Position> getPosition();
- private List<Position> setPosition();
+ private void setPosition();
diff --git a/src/main/java/model/FireFighter.java b/src/main/java/model/FireFighter.java
index 11b879f..8121da0 100644
--- a/src/main/java/model/FireFighter.java
+++ b/src/main/java/model/FireFighter.java
@@ -5,7 +5,11 @@ import util.Position;
import java.util.List;
import java.util.Set;
-public class Firefighter extends Element implements Extinguish {
+public class FireFighter extends Element implements Extinguish {
+ @Override
+ public void action() {
+
+ }
}
diff --git a/src/main/java/model/FirefighterBoard.java b/src/main/java/model/FirefighterBoard.java
index ee29f18..ae9e565 100644
--- a/src/main/java/model/FirefighterBoard.java
+++ b/src/main/java/model/FirefighterBoard.java
@@ -86,6 +86,7 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
private List<Position> updateFirefighters() {// linh cuu hoa chia ra de dap lua
List<Position> result = new ArrayList<>();
List<Position> firefighterNewPositions = new ArrayList<>();
+
for (Position firefighterPosition : firefighterPositions) {
Position newFirefighterPosition = neighborClosestToFire(firefighterPosition);// linh ra den cho gan nhat co lua
firefighterNewPositions.add(newFirefighterPosition);// cap nhat vi tri moi cua linh cuu hoa
--
GitLab