From 1991c911b5d7525da2d6045a5efda2eb113d58b8 Mon Sep 17 00:00:00 2001
From: Celia AREZKI <celia.arezki.1@etu.univ-amu.fr>
Date: Fri, 29 Nov 2024 10:34:07 +0100
Subject: [PATCH] Correction

---
 .../executionHistory/executionHistory.bin     | Bin 89421 -> 89421 bytes
 .../executionHistory/executionHistory.lock    | Bin 17 -> 17 bytes
 .gradle/8.10.2/fileHashes/fileHashes.bin      | Bin 29497 -> 29497 bytes
 .gradle/8.10.2/fileHashes/fileHashes.lock     | Bin 17 -> 17 bytes
 .../8.10.2/fileHashes/resourceHashesCache.bin | Bin 25059 -> 25127 bytes
 .../buildOutputCleanup.lock                   | Bin 17 -> 17 bytes
 .../main/model/BoardFireFighterBehavior.class | Bin 9594 -> 9745 bytes
 .../compileJava/previous-compilation-data.bin | Bin 22505 -> 22506 bytes
 .../java/model/BoardFireFighterBehavior.java  |   7 ++++
 src/main/java/model/FireFighterMovements.java |  35 +++++++++---------
 10 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/.gradle/8.10.2/executionHistory/executionHistory.bin b/.gradle/8.10.2/executionHistory/executionHistory.bin
index 6741c512681214aa04e5d1d9d09f278133be9b06..e54cf45c2a81c46f3da5bba2ce382f3aa65d7197 100644
GIT binary patch
delta 362
zcmX@Ri}ma-)`l&NFOBR<j54!RjS4d|i&BfS(sE2vE33>4imQyu3I&o6oj$3azQ)Sj
z{nGW$MY~FlaA62-zPMYEXS;<xBM*y!gJPttfX2e$yK9(>mcHIKW%Iw&O-z&jpJm;C
z+m&%C^Ys7nj9uHgyciuh1uhGkJ+0W>c+9*(YS%?MPtmE4jFYFo3uf$MIn?xM=kz=+
zM&s%0Ll{p;yxYETrgQvl(TUfWYhF6}H*jCeqn+E0Ci+Zo)Mhl9emInI8}sv)N7HM<
z81FMbZGJR8E}SuZdbuv60L$#wM?0r?>oQ7De-h3pz;U}3q;Y}B<bu0u)0H9^=P>_h
zeYE{x1fvO~K=-@LXJvzPOg5z4W~{4W=$mZ2LzShs?a|KZ3T%uz+oPfwMHvP9wB}6q
zxYmB@#irCG{h*ysw->TAu4j}_YumDXyVSPmJ8uu)&In!g;&dCxo>%J`Sr{1@wDJIO
CaiQ@5

delta 389
zcmX@Ri}ma-)`l&NFOBRn^D@%2P191Vl2UWh@^j5f%u_2WDvZnXDh1ZQ`WSIKb-kBj
z??TsDFRlGMcrk=FU)(Lov)#g;k%vX#$?VGu^R2iwEmxLZ)(CH`+WhZy6Vv4XXIZ!3
zc4b`3Ebw{Fo0@&EBl4H;X55f{prdj71W(4@oB~>(j(&PPed23{lHfEc1Fxx59T_K2
ze;3Ty#qw(Hk)6}?v>1)2uMc57A)$RREcv#AS^BKnz4t}eO0>0XII?rQ(J!y*joOSR
z(+`I-Zew1#;mGuwFvk1LbJri49v99SF0pR6^6mBgZZ$8bX08hIUCnkItm(Jv^nP7N
z@##;(83i~RHiFDqATqh&uG(~^2*x?g+cqBAelUX3gi$~y+t+DXN|tR){;HKH_}95j
zw%wu1a%AI?ozoTA7<INsMKOvp3M|!oqxtv7$0e+1j%>6(RexoBAv@!GM)}TJ|3!OZ
cjD0uX%4{;US{gTf6Ud&I>ls-X85p$k0EM})<NyEw

diff --git a/.gradle/8.10.2/executionHistory/executionHistory.lock b/.gradle/8.10.2/executionHistory/executionHistory.lock
index 5e253391d2b44a77de6450314cd2f8a3eee59b67..2e20131c08b5e00ca0efc3f288568ff13eba939d 100644
GIT binary patch
literal 17
UcmZQRe96UU<&lZk7$D#U06xYA<p2Nx

literal 17
UcmZQRe96UU<&lZk7$D$206x71+yDRo

diff --git a/.gradle/8.10.2/fileHashes/fileHashes.bin b/.gradle/8.10.2/fileHashes/fileHashes.bin
index de4bee79ebbde603ea446bd1acc2538579b0c04e..245e14138f7ab7cc7b0d64fc506744612c339ef3 100644
GIT binary patch
delta 262
zcmdn_jB)2P#tqyl3Jv11UhKIql}aqneQELGZe(C!oLp{Exs3q~G>kWErxdd=TQoXN
zUYPMn;obIyGo9mai%z`0T=UY&zkv|dO?F_#3~GX#7iVr~WVUF0IypA`JF`VI@8s2S
zQkx5NbQl%V+O{m;F10QC&fCMcGeTFrfM{*@hG-3cHCZuFee;vtd}al%GEVoB8BxAo
zbJxsuDB(#2t2DFw15wFaKe@QDOkvl7JH`%+--zEi`Ak!``@=P`B8#Tk5JiI7lR1mj
hnJt=bPc|+(%52e;KKXZ%KEFlN4~RTp76Su=9ss9(T&Dm4

delta 262
zcmdn_jB)2P#tqyl3L^jQ%C<_}JGp<7g2L|8>%18l7$=t-a(6R;f!e;!+9|~>%!XpG
zCNIo*q@aB;Ecv#AS^BKnz4t}eO0+>#OR#_yGpJT=UYxm|k=amu?&R3)@63i0M<%b1
zliFOEqr<4sIqSb@PmHne=3ALfhE_}CAX+8GAzH&<PFBoQ-~1#upIO1?xbcI)FV5lt
z%p#rj9E{o!mE4XHl{|fuiwnyX*6mily}sYA=H=APRYAV1*&vD}q9KZeeoy8sQfD@l
eXqaqVbd=dpLUZ!(B7J^CiER*hzAOd?20Z|&G*g%W

diff --git a/.gradle/8.10.2/fileHashes/fileHashes.lock b/.gradle/8.10.2/fileHashes/fileHashes.lock
index d337261118968ae302abf502a379b81ce3042e70..59c76d3da0fbaba3be498d2fc4dd5a161317e9a2 100644
GIT binary patch
literal 17
VcmZR+_F~glt9wx?3}C=I2LMG`1>gVx

literal 17
VcmZR+_F~glt9wx?3}C=o2mnPc1+@SG

diff --git a/.gradle/8.10.2/fileHashes/resourceHashesCache.bin b/.gradle/8.10.2/fileHashes/resourceHashesCache.bin
index 8b7596b93d5b785bbd5c8577381965c0cef54afd..34d9a297c5342af347b6757e0b6c7e7b2b507020 100644
GIT binary patch
delta 129
zcmaESm~r_L#tkMCjE6UyN=UE?oZ2GY`i5Wi4g(k@v2J#i`@k(wdw!8poLlo}upmR?
z<H@>O+KiDK6@Q3tG&sPz+0kQ>q?|DW1A`<31A`z43-~{pSDGoztl=~1+IDSyKmN%F
bV}*qkBV`3N76#v4!(6oV^{y!l3=DDraIz>o

delta 40
xcmZ2}gz@oV#tkMCj0ZQHN=UG6PL+GXJvmiNnNf42;t%nS1|L{AJ9;dV1OPzv4>kY*

diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 513e4c3656a446659afbd58d041574dc7193a9d8..836c670f35bd46c99bcad5b2783dc79c9cf61fad 100644
GIT binary patch
literal 17
VcmZSn@!s@&$JN{N3}C=C697c_1>pby

literal 17
VcmZSn@!s@&$JN{N3}C=i3jjph1;qdW

diff --git a/build/classes/java/main/model/BoardFireFighterBehavior.class b/build/classes/java/main/model/BoardFireFighterBehavior.class
index 73c96608eed963e1df5de92bd48d2cc6f8272565..73035e5aa50a24d4a325bca8cd9ed33148697c76 100644
GIT binary patch
delta 4355
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
QxOc_Kn8ldGn8zRq0Eaugs{jB1

delta 4205
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
D1@Wr_

diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin
index 65a9666d853a2108b980d9edbe3acfdea3864d6f..61c84f5db84df19f0c69718127709f4ff377b8e0 100644
GIT binary patch
delta 61
zcmaF4p7GUs#tnRo0=o{}F?Lw|M*PmnXPUCzAFgedV@zTcc(;AwOy~I9q7$z#*SvJ{
UZ{X$$OrMyUn8h|Xv!w+B0HZ4$vj6}9

delta 60
zcmaF0p7G^+#tnRo0_%1w-(KJER`YUd=Bgmy)oh#P7?T(Uv=4?Q-&Qb7pH;i}zUW$s
Sw#^fmJ~1;gZEj&p3j_ctxET=u

diff --git a/src/main/java/model/BoardFireFighterBehavior.java b/src/main/java/model/BoardFireFighterBehavior.java
index 3e1d9f2..6fb36d0 100644
--- a/src/main/java/model/BoardFireFighterBehavior.java
+++ b/src/main/java/model/BoardFireFighterBehavior.java
@@ -54,6 +54,13 @@ public class BoardFireFighterBehavior implements BoardBehavior{
 
     public static void extinguish(Position position) {
         fireMovements.getPositions().remove(position);
+
+        // Si la position est une montagne, elle cesse d'être une montagne
+        if (rocky.contains(position)) {
+            rocky.remove(position);
+            terrainMap.remove(position); // Optionnel, si vous utilisez terrainMap pour gérer les types de terrain
+            System.out.println("Une montagne a brûlé à la position : " + position);
+        }
     }
 
 
diff --git a/src/main/java/model/FireFighterMovements.java b/src/main/java/model/FireFighterMovements.java
index 2827830..6e1ded8 100644
--- a/src/main/java/model/FireFighterMovements.java
+++ b/src/main/java/model/FireFighterMovements.java
@@ -25,38 +25,39 @@ public class FireFighterMovements implements Movements{
         List<Position> newFirefighterPositions = new ArrayList<>();
 
         for (Position firefighterPosition : firefighterPositions) {
-            // Trouver la position cible en excluant les montagnes et les positions non valides
-            Position newFirefighterPosition = getNeighbors().get(firefighterPosition).stream()
-                    .filter(pos -> !getRocky().contains(pos)) // Exclure montagnes
-                    .filter(pos -> canMoveTo(pos, (Set<Position>) fireMovements.getPositions(), firefighterPositions)) // Valider mouvements
-                    .findFirst()
-                    .orElse(firefighterPosition); // Reste sur place si aucun mouvement valide
-
-            if (!newFirefighterPosition.equals(firefighterPosition)) {
-                // Déplacer et éteindre feu
+            // Calcul de la position vers laquelle le pompier devrait se déplacer
+            Position newFirefighterPosition =getTargetStrategy().neighborClosestToTarget(firefighterPosition, fireMovements.getPositions(), getNeighbors());
+
+            // Vérification si la position cible est valide pour le mouvement
+            if (canMoveTo(newFirefighterPosition, (Set<Position>) fireMovements.getPositions(), firefighterPositions)) {
+                // Si le déplacement est valide, on met à jour la position du pompier
                 newFirefighterPositions.add(newFirefighterPosition);
+
+                // Éteindre le feu à la nouvelle position
                 extinguish(newFirefighterPosition);
                 modifiedPositions.add(firefighterPosition);
                 modifiedPositions.add(newFirefighterPosition);
 
-                // Éteindre les feux voisins accessibles
+                // Vérification des voisins et extinction des feux voisins
                 List<Position> neighborFirePositions = getNeighbors().get(newFirefighterPosition).stream()
-                        .filter(fireMovements.getPositions()::contains)
-                        .filter(pos -> !getRocky().contains(pos))
-                        .toList();
+                        .filter(fireMovements.getPositions()::contains).toList();
+
+                // Log pour débogage
+                System.out.println("Pompiers se déplacent de " + firefighterPosition + " vers " + newFirefighterPosition);
 
+                // Éteindre les feux voisins
                 for (Position firePosition : neighborFirePositions) {
                     extinguish(firePosition);
-                    modifiedPositions.add(firePosition);
+                    modifiedPositions.add(firePosition);  // Ajout des feux éteints dans la liste des positions modifiées
                 }
             } else {
-                // Pompier reste sur place
+                // Si la position n'est pas valide, le pompier reste sur place
                 newFirefighterPositions.add(firefighterPosition);
-                System.out.println("Pompier bloqué à " + firefighterPosition);
+                System.out.println("Pompier ne peut pas se déplacer à " + newFirefighterPosition + ", il reste à " + firefighterPosition);
             }
         }
 
-        // Mise à jour des positions des pompiers
+        // Mettre à jour la liste des positions des pompiers
         firefighterPositions = newFirefighterPositions;
         return modifiedPositions;
     }
-- 
GitLab