diff --git a/.gradle/8.10.2/executionHistory/executionHistory.bin b/.gradle/8.10.2/executionHistory/executionHistory.bin
index 37f13357df6b407f997ab86d84b72576c29f29df..bb9bfa0127f771ccf9722b3a8bb16992b1b3d07b 100644
Binary files a/.gradle/8.10.2/executionHistory/executionHistory.bin and b/.gradle/8.10.2/executionHistory/executionHistory.bin differ
diff --git a/.gradle/8.10.2/executionHistory/executionHistory.lock b/.gradle/8.10.2/executionHistory/executionHistory.lock
index 363ba77866067b5504306e4f45f45d4ae2a127f0..5c1b40c97908a0fc3d672947b216462d7da3df21 100644
Binary files a/.gradle/8.10.2/executionHistory/executionHistory.lock and b/.gradle/8.10.2/executionHistory/executionHistory.lock differ
diff --git a/.gradle/8.10.2/fileHashes/fileHashes.bin b/.gradle/8.10.2/fileHashes/fileHashes.bin
index f320096ffc8b26d13ba7eeefc3260bf7888f28c4..b797883edc0305686413eeb0d6c30e2ef5e3b1ea 100644
Binary files a/.gradle/8.10.2/fileHashes/fileHashes.bin and b/.gradle/8.10.2/fileHashes/fileHashes.bin differ
diff --git a/.gradle/8.10.2/fileHashes/fileHashes.lock b/.gradle/8.10.2/fileHashes/fileHashes.lock
index 01fae74c2ca3c616b36fc8e76a957cef1796d5de..f09985bf0544a6f6f78008a154d23bfca3cd28e1 100644
Binary files a/.gradle/8.10.2/fileHashes/fileHashes.lock and b/.gradle/8.10.2/fileHashes/fileHashes.lock differ
diff --git a/.gradle/8.10.2/fileHashes/resourceHashesCache.bin b/.gradle/8.10.2/fileHashes/resourceHashesCache.bin
index 88570c3d2ba4a30fe0cd4c773a419367187ea0e8..8a305ae346ec38dde367c11632125a4760bad650 100644
Binary files a/.gradle/8.10.2/fileHashes/resourceHashesCache.bin and b/.gradle/8.10.2/fileHashes/resourceHashesCache.bin differ
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 950049cb433493e9e98aa43cfbfb033f13f855f7..e4d4b06165d0f27a0993c03d7763a3c8fedfd1bc 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
index 2c6b1f8040a0d839c090b0b6cf96273a80adf572..d6d7c438d1ccf5c849a51d9e4c7ec08802ad034b 100644
Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ
diff --git a/build/classes/java/main/app/SimulatorApplication.class b/build/classes/java/main/app/SimulatorApplication.class
index 2480ab48b12df0492a27234fdb5e80ebc956a289..a46a68d2a3f544dacab62174944a8fc6e507c17b 100644
Binary files a/build/classes/java/main/app/SimulatorApplication.class and b/build/classes/java/main/app/SimulatorApplication.class differ
diff --git a/build/classes/java/main/app/SimulatorMain.class b/build/classes/java/main/app/SimulatorMain.class
index 1d13229f73ef27c233a432bc89aa3dffc086246a..4530cc2971636d0c78bcf91139a4f699c2f20eb4 100644
Binary files a/build/classes/java/main/app/SimulatorMain.class and b/build/classes/java/main/app/SimulatorMain.class differ
diff --git a/build/classes/java/main/controller/Controller.class b/build/classes/java/main/controller/Controller.class
index 8cefcf715c582ae430a0e9d49ab558cfba9fccaa..02679c8af9d81f5f6e5c1ed10decb024a691ba4c 100644
Binary files a/build/classes/java/main/controller/Controller.class and b/build/classes/java/main/controller/Controller.class differ
diff --git a/build/classes/java/main/controller/PersistentToggleGroup.class b/build/classes/java/main/controller/PersistentToggleGroup.class
index 314954a9fd4ab6d48da5fec7067063879e670d62..5ccef4da42dee9301d32078f998d43094c421149 100644
Binary files a/build/classes/java/main/controller/PersistentToggleGroup.class and b/build/classes/java/main/controller/PersistentToggleGroup.class differ
diff --git a/build/classes/java/main/model/Board.class b/build/classes/java/main/model/Board.class
index 38636074a072f0e4ce3549152ba24a266261d8c3..d2b9e0a8bf6b498a7e1e1cc7f100b7949948329e 100644
Binary files a/build/classes/java/main/model/Board.class and b/build/classes/java/main/model/Board.class differ
diff --git a/build/classes/java/main/model/BoardBehavior.class b/build/classes/java/main/model/BoardBehavior.class
index 056f9a3c8591df18076ad64c8d030b1ebbf2682b..a535dd85cfda4a470deba0064e805fc2465a72a1 100644
Binary files a/build/classes/java/main/model/BoardBehavior.class and b/build/classes/java/main/model/BoardBehavior.class differ
diff --git a/build/classes/java/main/model/BoardElement.class b/build/classes/java/main/model/BoardElement.class
index 6e971176d712579acab06c447882d46aa45dac8c..3dd8554cc2b26635b757e21bbcdc9bf3a97ec9ee 100644
Binary files a/build/classes/java/main/model/BoardElement.class and b/build/classes/java/main/model/BoardElement.class differ
diff --git a/build/classes/java/main/model/BoardFireFighterBehavior.class b/build/classes/java/main/model/BoardFireFighterBehavior.class
index abdd4060612aa38dc83ab7671d23c3902bc58437..6c8581e0b858aa4b4c8736be962bb0d305c36d9b 100644
Binary files a/build/classes/java/main/model/BoardFireFighterBehavior.class and b/build/classes/java/main/model/BoardFireFighterBehavior.class differ
diff --git a/build/classes/java/main/model/BoardFirefighterProperties.class b/build/classes/java/main/model/BoardFirefighterProperties.class
index a094b5badf9a5c8b929c25141e712d65a3445892..3722f9e6332e6c930d36ee30fdf5089878b86ddb 100644
Binary files a/build/classes/java/main/model/BoardFirefighterProperties.class and b/build/classes/java/main/model/BoardFirefighterProperties.class differ
diff --git a/build/classes/java/main/model/BoardProperties.class b/build/classes/java/main/model/BoardProperties.class
index 93736154cb1db5f0fd6077cdc429a64c015a59c3..309b5e5207e85358e6ec9d55b56a577637ab5cc7 100644
Binary files a/build/classes/java/main/model/BoardProperties.class and b/build/classes/java/main/model/BoardProperties.class differ
diff --git a/build/classes/java/main/model/ElementFactory.class b/build/classes/java/main/model/ElementFactory.class
index fc2bd74472da9eb0ad654c8764a26baf67bdf15d..5cf37726c12ba4bade2aaee9d5b2049d9e3e26fb 100644
Binary files a/build/classes/java/main/model/ElementFactory.class and b/build/classes/java/main/model/ElementFactory.class differ
diff --git a/build/classes/java/main/model/Fire.class b/build/classes/java/main/model/Fire.class
index 12744497c0b4168a756584b31df839866c40bdf5..24888cdc22f4bb980bc840cc2062512750ff19c7 100644
Binary files a/build/classes/java/main/model/Fire.class and b/build/classes/java/main/model/Fire.class differ
diff --git a/build/classes/java/main/model/FireFactory.class b/build/classes/java/main/model/FireFactory.class
index 1663c2261a007eb99f47e6a3815e106f4ad6eca7..63ec280e55d1c3b09f0328944b6695f7f41db67e 100644
Binary files a/build/classes/java/main/model/FireFactory.class and b/build/classes/java/main/model/FireFactory.class differ
diff --git a/build/classes/java/main/model/FireFighter.class b/build/classes/java/main/model/FireFighter.class
index 6a9fddbd22bf77ca244173120fa183fe11a127e6..95da58b3d52ea957c4742b40524e4699481a927b 100644
Binary files a/build/classes/java/main/model/FireFighter.class and b/build/classes/java/main/model/FireFighter.class differ
diff --git a/build/classes/java/main/model/FirefighterBoard.class b/build/classes/java/main/model/FirefighterBoard.class
index a9431595c0512fa7d8447213160c4adef990b8b0..a4128eee52cb73ba7c6a7a16731272fc0d9a23eb 100644
Binary files a/build/classes/java/main/model/FirefighterBoard.class and b/build/classes/java/main/model/FirefighterBoard.class differ
diff --git a/build/classes/java/main/model/FirefighterFactory.class b/build/classes/java/main/model/FirefighterFactory.class
index 920e538c1bdada9fae8840e28871963a6761dd61..e4dc8d8797f5941c778c89aee12d50fbbc53ec23 100644
Binary files a/build/classes/java/main/model/FirefighterFactory.class and b/build/classes/java/main/model/FirefighterFactory.class differ
diff --git a/build/classes/java/main/model/ModelElement.class b/build/classes/java/main/model/ModelElement.class
index 155b653963166f37418e8bdaf6c396a855faacdd..55c5477e85b71491e999808b143e4a9a6f246f78 100644
Binary files a/build/classes/java/main/model/ModelElement.class and b/build/classes/java/main/model/ModelElement.class differ
diff --git a/build/classes/java/main/model/PositionGenerator.class b/build/classes/java/main/model/PositionGenerator.class
index 348edab54a85a9a8685f4479d5078d39bbe4928a..556d364eed0180aa5daa8c56c559f0484d08c6e4 100644
Binary files a/build/classes/java/main/model/PositionGenerator.class and b/build/classes/java/main/model/PositionGenerator.class differ
diff --git a/build/classes/java/main/module-info.class b/build/classes/java/main/module-info.class
index a05e120336680c15a80138be7c30617ca4e5473c..7a769b70875d147512dd0dc3f725d1c113981548 100644
Binary files a/build/classes/java/main/module-info.class and b/build/classes/java/main/module-info.class differ
diff --git a/build/classes/java/main/util/Position.class b/build/classes/java/main/util/Position.class
index 949d5a4547ec8c6b8f739aa883d42043f82a62ed..8e859130f0037dab2e4ebfc7d976894f8abe38ab 100644
Binary files a/build/classes/java/main/util/Position.class and b/build/classes/java/main/util/Position.class differ
diff --git a/build/classes/java/main/util/Strategy.class b/build/classes/java/main/util/Strategy.class
index eb66209f3dd056875eca5fc68f693422131591f0..970de74442843b7dd05680aa1b504198ab066d92 100644
Binary files a/build/classes/java/main/util/Strategy.class and b/build/classes/java/main/util/Strategy.class differ
diff --git a/build/classes/java/main/util/TargetStrategy.class b/build/classes/java/main/util/TargetStrategy.class
index 615d840c8b938f886069802d4128013485ef851c..21d04fa47c792c7b5afe2ceb0fdffa4470135de2 100644
Binary files a/build/classes/java/main/util/TargetStrategy.class and b/build/classes/java/main/util/TargetStrategy.class differ
diff --git a/build/classes/java/main/view/FirefighterGrid.class b/build/classes/java/main/view/FirefighterGrid.class
index 831699ca3ca58a17f7b79bad1d1464aeb6d30a4c..2343d40902ddbfc3d1c8003c494c10d520884c6c 100644
Binary files a/build/classes/java/main/view/FirefighterGrid.class and b/build/classes/java/main/view/FirefighterGrid.class differ
diff --git a/build/classes/java/main/view/Grid.class b/build/classes/java/main/view/Grid.class
index c4fa5e96b46909e2a89e512f2ad9c2d4d042260c..3d42b97050079349780725b186452a4ef88502d2 100644
Binary files a/build/classes/java/main/view/Grid.class and b/build/classes/java/main/view/Grid.class differ
diff --git a/build/classes/java/main/view/ViewElement.class b/build/classes/java/main/view/ViewElement.class
index d0471616c011462091e4c625d056897d0b601755..768e7bbdc49e39ab1556792461ee8bf85906432e 100644
Binary files a/build/classes/java/main/view/ViewElement.class and b/build/classes/java/main/view/ViewElement.class differ
diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin
index 0a5907e7f3d3e82fa066c6e994dcccdab16f8dc2..f0c11b5daf04fb312f878ceff61a921d1a2ec7b6 100644
Binary files a/build/tmp/compileJava/previous-compilation-data.bin and b/build/tmp/compileJava/previous-compilation-data.bin differ
diff --git a/src/main/java/model/BoardFireFighterBehavior.java b/src/main/java/model/BoardFireFighterBehavior.java
index a726a3ce99d559beea3061af4ae64a3b949ceb97..7e120d0a38f97272a4875ebd7d4114b960458006 100644
--- a/src/main/java/model/BoardFireFighterBehavior.java
+++ b/src/main/java/model/BoardFireFighterBehavior.java
@@ -85,6 +85,22 @@ public class BoardFireFighterBehavior implements BoardBehavior{
private void extinguish(Position position) {
firePositions.remove(position);
}
+ /**
+ * Éteint les feux autour d'une position donnée.
+ *
+ * @param firePositions Les positions des feux actuels.
+ * @param firefighterPosition La position actuelle du pompier.
+ * @param modifiedPositions Les positions modifiées pendant ce tour.
+ */
+ protected void extinguishFire(Set<Position> firePositions, Position firefighterPosition, List<Position> modifiedPositions) {
+ List<Position> nearbyFires = neighbors.get(firefighterPosition).stream()
+ .filter(firePositions::contains)
+ .toList();
+ for (Position fire : nearbyFires) {
+ firePositions.remove(fire);
+ modifiedPositions.add(fire);
+ }
+ }
public Set<Position> getFirePositions() {
diff --git a/src/main/java/model/MotorizedFireFighter.java b/src/main/java/model/MotorizedFireFighter.java
index 4583c82aeb308cc15dd412dc8bad9a41aa913482..88df1289d42afa91d38e7bedf69ead5b1e93e0e9 100644
--- a/src/main/java/model/MotorizedFireFighter.java
+++ b/src/main/java/model/MotorizedFireFighter.java
@@ -3,10 +3,7 @@ package model;
import util.Position;
import util.TargetStrategy;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
+import java.util.*;
public class MotorizedFireFighter extends FireFighter{
private final TargetStrategy targetStrategy = new TargetStrategy();
@@ -16,17 +13,18 @@ public class MotorizedFireFighter extends FireFighter{
- public Position move(Map<Position, List<Position>> neighbors, Set<Position> firePositions) {
- // Utilisation de targetStrategy pour le premier mouvement
- Position firstMove = targetStrategy.neighborClosestToTarget(position, firePositions, neighbors);
+ public Position move(List<Position> positions,Map<Position, List<Position>> neighbors, Set<Position> firePositions) {
+ List<Position> modifiedPositions = new ArrayList<>();
+ List<Position> newPositions = new ArrayList<>();
+ Position finalPosition=null;
+ for (Position firefighterPosition : positions) {
+ // Déplacement motorisé (deux cases maximum)
+ Position firstStep = targetStrategy.neighborClosestToTarget(firefighterPosition, firePositions, neighbors);
+ Position secondStep = targetStrategy.neighborClosestToTarget(firstStep, firePositions, neighbors);
+ finalPosition = secondStep != null ? secondStep : firstStep;
- // Après le premier déplacement, obtenir les voisins du premier mouvement
- List<Position> possibleMovesFromFirst = neighbors.get(firstMove);
+ }
- // Utilisation de targetStrategy pour choisir la meilleure position à partir du premier mouvement
- Position secondMove = targetStrategy.neighborClosestToTarget(firstMove, firePositions, neighbors);
-
- // Si nous avons trouvé une position valide, déplace le pompier de 2 cases
- return secondMove;
+ return finalPosition;
}
}