From b9dbcaecd90a99707587007f6266dbab47b9e555 Mon Sep 17 00:00:00 2001 From: a22021617 <mohamed.asfour@etu.univ-amu.fr> Date: Fri, 8 Nov 2024 10:58:19 +0100 Subject: [PATCH] deleguation de notre classe par les classes Fire et FireFighter et modification de ces classes et de "positions" et de la methode initializaelements BY A.M --- src/main/java/model/Fire.java | 7 +++++-- src/main/java/model/FireFighter.java | 7 +++++-- src/main/java/model/FirefighterBoard.java | 12 ++++++++---- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/main/java/model/Fire.java b/src/main/java/model/Fire.java index e0de112..4e4693f 100644 --- a/src/main/java/model/Fire.java +++ b/src/main/java/model/Fire.java @@ -1,10 +1,13 @@ package model; +import javafx.geometry.Pos; import util.Position; import java.util.Set; public class Fire { - private final int initialFireCount; - private Set<Position> firePositions; + private Position firePositions; + public Fire(Position position){ + this.firePositions = position; + } } diff --git a/src/main/java/model/FireFighter.java b/src/main/java/model/FireFighter.java index d8bdf88..bd80252 100644 --- a/src/main/java/model/FireFighter.java +++ b/src/main/java/model/FireFighter.java @@ -6,7 +6,10 @@ import java.util.List; public class FireFighter { - private final int initialFirefighterCount; - private List<Position> firefighterPositions; + private Position firefighterPositions; + + public FireFighter(Position firefighterPositions) { + this.firefighterPositions = firefighterPositions; + } } diff --git a/src/main/java/model/FirefighterBoard.java b/src/main/java/model/FirefighterBoard.java index f324d7d..9c55246 100644 --- a/src/main/java/model/FirefighterBoard.java +++ b/src/main/java/model/FirefighterBoard.java @@ -8,7 +8,11 @@ import java.util.*; public class FirefighterBoard implements Board<List<ModelElement>> { private final int columnCount; private final int rowCount; + private final int initialFireCount; + private final int initialFirefighterCount; private final TargetStrategy targetStrategy = new TargetStrategy(); + private List<FireFighter> firefighter; + private Set<Fire> fire; private Map<Position, List<Position>> neighbors = new HashMap(); private final Position[][] positions; private int step = 0; @@ -36,12 +40,12 @@ public class FirefighterBoard implements Board<List<ModelElement>> { } public void initializeElements() { - firefighterPositions = new ArrayList<>(); - firePositions = new HashSet<>(); + firefighter= new ArrayList<>(); + fire = new HashSet<>(); for (int index = 0; index < initialFireCount; index++) - firePositions.add(randomPosition()); + fire.add(randomPosition()); for (int index = 0; index < initialFirefighterCount; index++) - firefighterPositions.add(randomPosition()); + firefighter.add(randomPosition()); } private Position randomPosition() { -- GitLab