From f7f2d6eeb9feee4cec8066b98c88ad8091b5f0a8 Mon Sep 17 00:00:00 2001
From: Maazouz <ilyas.maazouz@etu.univ-amu.fr>
Date: Thu, 23 Nov 2023 19:09:49 +0100
Subject: [PATCH] wcqsd

---
 .../8.4/executionHistory/executionHistory.bin | Bin 52690 -> 52690 bytes
 .../executionHistory/executionHistory.lock    | Bin 17 -> 17 bytes
 .gradle/8.4/fileHashes/fileHashes.bin         | Bin 24497 -> 26597 bytes
 .gradle/8.4/fileHashes/fileHashes.lock        | Bin 17 -> 17 bytes
 .../8.4/fileHashes/resourceHashesCache.bin    | Bin 21795 -> 22339 bytes
 .../buildOutputCleanup.lock                   | Bin 17 -> 17 bytes
 .gradle/buildOutputCleanup/outputFiles.bin    | Bin 19577 -> 19901 bytes
 .gradle/file-system.probe                     | Bin 8 -> 8 bytes
 .../java/main/app/SimulatorApplication.class  | Bin 3101 -> 3101 bytes
 .../classes/java/main/app/SimulatorMain.class | Bin 438 -> 438 bytes
 .../java/main/controller/Controller.class     | Bin 6854 -> 6854 bytes
 .../controller/PersistentToggleGroup.class    | Bin 2668 -> 2668 bytes
 build/classes/java/main/model/Board.class     | Bin 528 -> 528 bytes
 .../java/main/model/FirefighterBoard$1.class  | Bin 672 -> 672 bytes
 .../java/main/model/FirefighterBoard.class    | Bin 6926 -> 6926 bytes
 .../java/main/model/ModelElement.class        | Bin 988 -> 1034 bytes
 build/classes/java/main/module-info.class     | Bin 337 -> 339 bytes
 build/classes/java/main/util/Position.class   | Bin 1399 -> 1399 bytes
 .../java/main/view/FirefighterGrid.class      | Bin 3976 -> 3976 bytes
 build/classes/java/main/view/Grid.class       | Bin 401 -> 401 bytes
 .../classes/java/main/view/ViewElement.class  | Bin 1279 -> 1279 bytes
 .../compileJava/previous-compilation-data.bin | Bin 21208 -> 21208 bytes
 src/main/java/controller/Controller.java      |   3 +-
 src/main/java/newmodel/Fboard.java            |  19 +++++----
 src/main/java/newmodel/Fire.java              |   8 +++-
 src/main/java/newmodel/FireFighter.java       |  39 +++++++++++++-----
 26 files changed, 46 insertions(+), 23 deletions(-)

diff --git a/.gradle/8.4/executionHistory/executionHistory.bin b/.gradle/8.4/executionHistory/executionHistory.bin
index f84ef8498b8b5049936eb04fec700633f625bc0b..a5d0b3ec5b95972acdc0e1b1eb669aaa0e8035b5 100644
GIT binary patch
delta 1401
zcmcaKoB7gg<_Xel@$(rNSX4JEDoHSTIBs^8U^dWX(Pv;_(VtyZP?%_HmYbMUmQk8i
zV49a!QJ7d+SXGr?$^ZcZo6pD3Vq`ovSutLVB_lf{d$LZF#N>I2?2K2Cg(N56Ni=4>
zfGp(7co4zuOLAj8jNpDuvSGQs{mQe+hRKR7*FlW1WIZMpo6U_rk5g2oXU;CnN-Z$U
z$jvA&OUgCQ&MmAgH>*fBDlRNdg*c1l!{$N{E*>VKTL?pSLuDpMbO}s0?=qas7_JR*
zt!}74<8_3Z!fvU_2SNn}HZZGdmR_lp7U7HdvMDR=;N*v)GK`Oq)#Xk;8VNPy;(lkw
z8wk0J`$Z=^go{t^>(NCH1dy;@v9Q3GD_=5t1T+>2m}qN$dFnlRa$>P0!Ytoj=gBQF
z$8GF&M|RxCUWv(dCBl>059u&oMA$d6PgO{upuVtSPn{o2@P!rmJ^TJLPMy4<PXuAo
z#6C%>%%W7iti-ZJW`P5S?)G9S6GN^Xc<FYm<4M6}gMJalYse-_POj@06q=L}qZaBi
zVPXkS>zNs@fijG<CLb)7M3@S4kV6^w<jsdw5Q1|jx+9wvc_ftaG{Wf9N9-9dA-L}&
z{TTO5W{l8O2BjVS;-X~z+{Da0eULi^3}?SOUX{t^V4Y{OVROui4U^L+Yapkz^^+wh
ze~3~NO(^-I(Z5VzPQRw}Zt*(#=grfvzuZ4rJz7ip{MIYa_8V?vW@Zpj^O4_n?f-@N
z-j=@;;`>4vC+9>fi0lqv7d{;;TQ>WE&Y2?R$nLGrZ@ij(;Fz+u)^_>TTNlU%7X`$}
zsWjd@JsWJ$8xdv(f$8yO(HAZm>hW*>)l%%MdV2D^Xf@W~8?QXuKUp$HUi9*<-0=Al
zr>4cfC|S;=)jetQW{`|;jI5~1Gw+Ktmd?@M%jL!F`R=RfYOqXwjHI?*Y?pS>%&vQP
z`H$a=*0U4(4l>QKi-Va#U?+E)Mxahsv-q#Qm4%Da<0tb^5uJP^Mu2_i^Bb@B8(yBw
ze?n3uRN{_6|2LI4JJ)gSlh*Rzd3ei}XOnGCNY=mKc4%&#L2CB=AL}+L+0Q<A@fk={
z3oB!<TT*^vQHox2PGWH}gTR7kO>?}`mzW>hcfIjhPLj^eryzA-lo`9-K&b|*D&SLh
z+l`!FHGxd?3;Xmg)cpmkY7$|b1XAUenVwOSS_Ct4+k_=GzLqAQx~>0xcCOX1Qis^R
zM~<;Ovm`YarYzyi>pwM9I#cidY31NvQZ5Uzc{V7<a-VZIhff!uaYo^~<;!P(A52y}
zDKVKNR)F<BD0n8z#+pjJ{=Dw(%}<Fw(;C&10zI1l-UbD!VTb(WtXMe~Q20*Xds1@p
z(pUk#$6%TNoXiXYyb~FcGPhP3JzVkkulJ$1tjr7oH=YQ&Ix;L;V5om>?|;tX^vQ;2
zG#Q^DlIg-}l9LUl1t910h10^AkV^!)jiw3$+wO_(Qhes(d1c92x!758t#84RbYm$a
T3nK%A^s>qGr$tPTK3fg|Yr#~i

delta 1446
zcmcaKoB7gg<_Xel9*ztQ;&B@ll_Z$r=WlkEU^dVc_hn!Z_nn=cQc{(hYh0XJlvY-h
zT%MC}mTH_;nP!w-$p8k-PbOd3CO`SzMzzi7HXh~PTpjW<MpepbcBWB9Nmfa*S#eoL
zenpOPK}JfsS!q#jYIY`A8w2B6Bz@BvH(y9i<6;szIXSRfWO8ky@Z`vSLX+?Bb!0q*
zB;v|=49=_W7MOe>R8XK+wl6H&N1*T4dwtP=GG>C4ABM^>UPMxs%(!QAVVN-4(Ch=;
zlM{;c7>~o{vk&+)9!BDEPqr%-7SK<L<CswGWU|+YBm3&7H9sdO7E2--6W(jdxDRgV
z?p|9YcSRraWjp{kaCV=xkdmaW@Hr!%J%y50Z{Dfha%Y@6c|o5Dk^#|&B?X?iXnA-p
zW7LclT+drF!7y~PLBGi4tp%cBXGb3vntZO5Phj(*yVV`hyG}}ovF3Yxyt#Wa;}K~j
zb9VRgO?D{bo}70?1xfVu5!=ZbT@ZsDk9srif;;@^QB%f)aHsx^bYWZ#lM~HKEK3x4
zx8qrP|EHZNzQ+Az4eEW7I5~Z?2IE$!8m`G3CQD5I5TzvYwtVUng=cR#UoV=ye)gI2
z#T_qi-kh9uTw1%uY$IEy%EJiV^WICcv~p~Y-QId*zu`7!W(I*%pY(st<WYOl{;IgN
zDMQ+M@`mFIQZHN_n>lY+GF|JGcr)1}Lu%!MwtM>xkC`&gnd}%QHt7VrcE~h8YtJNU
zg%b|`X)C{0<~_XyGVzTFGlRg~1Kb6(g#|meoS)Ysy7<_~$?u}YL;@z{`80egPkg$n
z_)guqYlpwy-g;wl%n1dNeHq>c3l8r%bGU^?+Ddfm(xVI7?oFO>LQd4N<>u}sLPwZR
zZOn}@HQW|-4&;W(^)Zr@pG+2zel{QEqC4!&3<9gyT{*sFy%_UV=J{b)I`8#O=AR-e
z?z-xj-E8v@E6R2T`DEO9k$D}Y+wkIK>nWNnD{gJQF*)I+WE!tdazWVxWiGb9TRKH^
zo-b$wD{5h7>~%}ZPb^B&OU_9wE@lw8*ft^Tq|{-%%f?6LgU?AkIRv(Roiby$TV_!z
zOx3b|H>`iJ;Y$u`dc<L9v{T|bSk)Zi$@fo+25wn#BtRv>Q{ZdOr<2pdt}XZtmOL!W
z*qvFDnhP`H=+uND(YAoriD#TS63Q2Po&>9!4T`7vy&3!+-&X8bJF)rivZBP~$sb}Q
zCihPjkp6Q66!PD>m>C58ji0%!64Cf|d?lOqqOu7JlRHkyTZPU&w`S`fbGiFZ4hwnA
z`XxW};MJS^4Ljr+yWNX2;a&`GurNQa;V5fXefQws=M4+`LGknOl%(C34yA(^WDEoy
z_O?8$($p0AaR8+KKPNMTK*y(bw<9k(&v~5oXVR0*irdT#0-|~r-LmBmr^%gjj^}b0
zh?)GMT9ffIG--29UNlW&vca?fc(w<LgfhWP39iZO&zSl}oH}sR&t&3X_ZJ-YqRtK#
zQx}4w`o>a57DfgJDgPO*>jEe2Tl;dK;a)lXeweg(?aO_Wdt)UqJTV_6V+i(yhQkTN
uCc!Ts3U(Aq`x;LWWM&XB+J9jRPyFVY6Myi{-fT9#XY+?@Eyl^wXUhQ#9f9Eh

diff --git a/.gradle/8.4/executionHistory/executionHistory.lock b/.gradle/8.4/executionHistory/executionHistory.lock
index 584c58c264ded8a4cc878c1ef260c758712aa6bc..b7c2f5583a7dd831811c5b0de60eaf659d27068f 100644
GIT binary patch
literal 17
UcmZSnerm=1jKwqOF+jjZ07T~n{{R30

literal 17
UcmZSnerm=1jKwqOF+jjn07T0L;{X5v

diff --git a/.gradle/8.4/fileHashes/fileHashes.bin b/.gradle/8.4/fileHashes/fileHashes.bin
index 29043a2bc1179d522a50cf9b909ae36f711ce3eb..08803b8ad4c4e7d1cc6c401c51420d2742340c25 100644
GIT binary patch
delta 2001
zcmdnEpYiE=#tkMCl8YMSjjhj>B^EJ&LCW|4P%zn4VuD6zk%w@^yNX3%IfmrZP`UqI
zvvxHc+E{%VBA&Q(@?HrGfnE-Q_Tq)g8W6#hqm$oCWb#{>ub8Rur2`_Clsnm1@*zLF
zZt}HSlWvGuTKi;GsRn^9&t?BTs5%34M&jhTQVJS7IPNls>8#%kQJLNdvwqjMH)R_g
z#OFc8lmAZMDrL!^ZSvmM?RyeLEPmtUr&0<6`xYg|KYO>V5F(h`JNd8F42{zjo00_n
zibp{N)BRzlp0T*h|3N$52O^$qI=NRmK;uf$K{*cd<$@5wl*ur~S7%LWI=wQo93q~u
zdh%6i3xQkKm%O9C&Rhc#OtPNLDwCn{ve$4O+oBm$A%Y2_FcV(IuBxAHv*;8=Jn7=(
zRGAq9-!p?3aOxVXLIl%gCx4X*5cr#MLhpMV(*cNJs^(-{Sp^NoC)NkN|G1ok2*y8#
z8Ozi&Z>5XdDHn)%LgnO8*#H5yr(bH@9p&U9g6W$l&y`i=ms}>Lqswao5lfApyj6B4
zf6>tk@wL8Q5V5q-$*yuU1Z3XpA3U_^k{d)YdFJG+ataQr{F0nL=9i#>m2ekky=sc^
z=^WQ%Zy}14=EKC*<X#*UP@P=`5l?2G{8ny*fWCA56yAqdb0LBW?vtm=&*T^U;rhwm
z-xMO2qCZ(xK|#YVOE^m8T3#(gFwqfas$IX<xsP5GE<(hUI49dGWC%DtzP57x>$nhz
zVCu)oa}{Q21g^gq$=}`<2oX%%2{R$+?sboztS8|R@kIW~x{87PA`Y?5aW5F5V#Sk7
z6*B}9bXZ=p-8v@%5ll{>d{t3FBhyN>fv340ru#a~)SUNorX8<wJp@sl_ImPL#hLsz
z1vQ&EQ@WsH%9CrAGWq%BUkT0Sihziv?w@>DX%Q2@<3`0F;u{TaaBOz;C=j14>&G|Q
z-$TUi&lS~G5QPj53=9l<#taM$nhXpKiXbeY>m711>NC&TP3rDCGqh#%85kJ5k#uxS
zUg)950uq?48znVaGEfA<F$|QNtnCNo=zHoxL=!!wCRav5MJGn-)q^xb>}GVuw0oPz
z<lB`!Nmu@4WX^pp*&he8`>)H#D-a!g;+Q%dx7&SbG5w^daV}nQ-I)?6unxP$?GPPo
z{b)Lr859NP$p4t!u;uuFNs-z(+c%HSg0)y}S_{#_oj>_{1k{6!ky4XY{h_Y6^_QBg
z7=avmj5=thGbjpNa(#7i#ezWZjt>mYdWBxk!G@b2Ylavuxp4A-Pc?2tATUqPiByLK
z)!6`OnEelsn!MaggyqjwiTjiHdr3){JoCOdW9c02y<A?*p6|Yzg3SDLRdV&@k6wBp
zRlg^1jFs}Ti|x`5n%Q;lF8}d+(Ry}55LFW2AvUvcVY>D5t=#bW5~rrczbIMGq}4qM
zqC;}><cFbBlNWl6*nup8XlI;=sr~imb#HHeO7xl5sFoDy(fk*x{We4gf5+s{-fAp=
zu1Y?hEbAlXwcuIP9Ix~x=EwG3Z+w=Mqytj@H_YfJM77`-O!MDwJ2W@WAT@jbk9C`r
z>}Q{Y=r9hPyf<1(BH_&IKQ&W2Q}6z1<=|dYE(?(~x;a@fM#?MTQ+L~qoL)77O!Eu-
z^e)svCI3R~;$p(ID^%i+K>s(DH#^sH?332=-wD$3=c<(R<o+P3pluVD)L5E$>bCy(
z*|}E3N*yHmH_RAX1n}En8n-)uUHEjYY}xDsI%kTMBfFtGwn7{rb!>9D4=8A)W>0SP
z(KGuSX1o(3!x)TdRzk@ajs9i&a{4u$cZ=7_LsQi0=E+ZeK(Q}%ezJF{l*G1sqPrBI
xxp-b#a#k*OR$MF8#<!F2#zB)6e>{}o2x457zCM{hUQgi9RcUC1alZ!H4FLBsv?2fi

delta 151
zcmaEQo^j)T#tkMCj1`l8B_>Sfl{A<fDw#O>oaBwk`=rVz`$|hpo+@oP`JS}+WL}vG
zlh4X{Om>wunA|IyFj-b^!sMfJ9+Oq&B_`*}drUqnFFE<2{DjHN6#6IoDoRXVtGHrv
zuF}NGV#?x^W0eyoUsawkd8&%%<ZmkRlXF!iCT~@pI5|!&Ve&P#nM~Y)8x?<uZ!|c;
Kv)R$3KpX&rk~>KN

diff --git a/.gradle/8.4/fileHashes/fileHashes.lock b/.gradle/8.4/fileHashes/fileHashes.lock
index 797f7ce222793c73535024fee2ac478c8740e1d0..7ffccdbda4931f659d3234ec73f2e08e8601586a 100644
GIT binary patch
literal 17
VcmZSHU4OfW^YC9O1~6d00027b1zP|B

literal 17
VcmZSHU4OfW^YC9O1~6dO0RTEi1h)VH

diff --git a/.gradle/8.4/fileHashes/resourceHashesCache.bin b/.gradle/8.4/fileHashes/resourceHashesCache.bin
index 0299e170bd1a58c6114ddd2a115bcc7b95cf1738..02687afa3db118a567b09be0b471de862a223f02 100644
GIT binary patch
delta 929
zcmZ3yit+F|#tkMCjD?#`C3Z6L@4mBoU;Vr53}6s;ck)vy1&!m=3)m}teAK{V3}NN}
zq2TI!yH~yk)cT>~yC?sZQV_VkV#jaQe~F$@LF37y(hUMHR?hj+uzW8+L@;#q<X-6q
z0)H|l$$0&~*9{eXKRH##LV(3@!;S2JCp{p7VKXOBmHFWybtK$l_2J6>P{B~B{r}}Y
z8C*M4lX3(i9;yrzS3K;Y?&bUcEmS;xa;vO`fX0JQ(%R`)(jkIjf}6L>b~5rOZcRU<
zxI`Ty7}`16R6au^hG{~E-PepdsNh+cvB?T?MG8XJ*P!CAlc&ln2&BkfG-m&$+5iy@
z`#*WDyn;a5m2|h05#izx!EnXRN989mGI6cksQ5#Cqd@`hW=D@lJoUy53=EPC3=D!G
zEb!&Zmy8|(jYR?`+L~XUdQWCxV30#qQKZ{o!nozu+beyR>mya0<1kg+dX=yyYk@|@
zp^N2K0jw-jF;$f4{n&TsUL(VEVY&J+&U)i>m`WbzY8-5SS~u?pH-Goa`o4Bd71<(t
zT^cV-oqDri@%uXuSPd{$L^}AcWlix5clc;oZ_@ejKc))pp88X}|NQ9h{(E5hx`X|D
zLNS&6I&s1`Ay+e|`qezUYt<p3^oJHA8<<r!ORrQ)i||E!*_4%b5YvnwKeA44-v40Z
z<Tndu@=PexK~hl<4fqSMro?Z%%O<#ywfX5Rcb0cZN}wvdTrvX!-|gJNK4bANf04#`
zOcj$7V$?!iCQK~hX+1N;HBbgq#Q{Tid$E*>Ay*E(bUW7Zq=11z1wDQR3hE0R_SE^Y
O1YcN@-?Q&8$PfUA{u_$`

delta 82
zcmX@Sj&boS#tkMCjES2~C3Z4RW|J15>?<uXxmLPjGOx^y$$w=GCcDahm|QDou=%K5
oBje;ah4{&D6(lChDoSkjRqSG9;?&%z_(Oc7!3Vz0jvkMA0N4T^0RR91

diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 8f4c4f8be1eafa911e0b426006694127242ebc78..ddadcf33733c1bcc83a80d1fa35fb6c158f752be 100644
GIT binary patch
literal 17
VcmZQxT<%!==x@_91~6dU1^_&51)2Z=

literal 17
VcmZQxT<%!==x@_91~6dE0RTKB1yBG0

diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
index d8932ec1d7481b9d4ea1b36dd567a54507db259a..97757e493696f88cacfa26c546434f8d90d26a82 100644
GIT binary patch
delta 460
zcmex4gK_U{#tkMCk$$ZlVULpzU94gN17G|9P|%a*CFPN@BpEEs;HeE2{y+KNMV5R0
z?}{MeK9w->IV;aMr@OIDgNlFO>?&cvB=GpFV4~oAn=??+%ae1ZG6X*Pg>Pa$qw4?_
z?4Ep9%0l4JlN__j0S|g1g1*v||4L;D@V`ChqpIBf4<hI@cXF(>f`G&lUEbKnMY|w^
zzU`Asr4<BZJ{)g3aHqx!BIvVza<6oQhQa=br<-2=SppIC4TQPXl*M;O(M+Zgh`7(w
z$*eLb1VRpT9n3yAHyA2-aPm<Z1%dFIE3Y;`isXj~`mUaQS4Ke~rZ!kc`Mf7A$YxId
zDr2FMY1-HE`^z;As7g+lT{-XPOgmoVdI&0>JXuv%K_f5Zu*B;#3;Lmgr7*?$N;5R$
w&Q|k4#dRm!$}VDJPu!^ZLwuvb4uQ>%9u_Q<`@QE*PVi8f+~65Cd4ZQE01T<Il>h($

delta 84
zcmdlxoAKui#tkMCj5d>fB_uXamC#_Cd{ru8vahtk<f+mLlX+z%CfmwLOwN_5m@F!L
rVDej8iOI5Z5|e%93?{FYlbHNfZWa^k#*K<U#5Wpb2yJ%suwVfI<)j@;

diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe
index 9b534bce67f2ed9a0fb4b5a34a3bb5cabdbfcd9d..296a051a57bcda0fb14333f1fc918572ca487b55 100644
GIT binary patch
literal 8
PcmZQzVC?=IrWXnT2y6ml

literal 8
PcmZQzVC-&m>^}<t2X_Li

diff --git a/build/classes/java/main/app/SimulatorApplication.class b/build/classes/java/main/app/SimulatorApplication.class
index 91a66301ebaccdd0180a5e8ca2e120d1ed08a5b4..e0ff69034ab3b3dca33d7331e7fbd83218f359f0 100644
GIT binary patch
delta 17
ZcmbO$F;{}))W2Q(7#J9AH*$#b002FJ1<C*b

delta 17
ZcmbO$F;{}))W2Q(7#J8FHgbsa002FY1<e2e

diff --git a/build/classes/java/main/app/SimulatorMain.class b/build/classes/java/main/app/SimulatorMain.class
index 4530cc2971636d0c78bcf91139a4f699c2f20eb4..b426382855daa4f8e3ff421f7108c0b298a18d65 100644
GIT binary patch
delta 17
ZcmdnSyp5UT)W2Q(7#J9AH*&0F1OPu#24DaH

delta 17
ZcmdnSyp5UT)W2Q(7#J8FHgc?E1OPu^24esK

diff --git a/build/classes/java/main/controller/Controller.class b/build/classes/java/main/controller/Controller.class
index c6d314abae95d116bb74b2b05f1aa412f0ff5de8..d6b267cb0f38c6486808837f61ba866434fae1d3 100644
GIT binary patch
delta 280
zcmX?Rdd!sL)W2Q(7#J9AH*%<oD0(pnFnBX)Gx#u=G59gqF$6LMFa$9KGXyilGK4T>
zFobUQ6X9djjAGzmh-MIAh+z<Ch-FY<h-1)Xh-YwPh-2_!h-C<3NMMLzNMuN7NSfR#
zx?V7ifrlZTL4YBXL53lVL4hG>va8ra(Lx4ph9U+bh7tw^hEfJ&hB5|ghVse3#qwFJ
z8Q2+WCg+RWvo<iWGc-=#EN;Wv%D}?VHu;OV4Qm$z3q$v0Qwe{;2@EU@6B)P}CNT&z
zOlA;gm@;{)M4#eJ20n&a4B`y488jH?Fjz9oWpHPh$Kb;-pCO200YezW!pSa@i#V4u
hurMrR;9yuj`Msnw>na9rhSihJrQ8^cC)Y`N005biKGy&M

delta 280
zcmX?Rdd!sL)W2Q(7#J8FHgc$nD0(soFnBR&Gk7zYG59jrF$6FKFa$CLGXycjG6XYZ
zFobOO6X9djjAY<oh++_6h-MIHh+$A*h-J`Zh+}YLh-L6$h+zm~h-ZjlNMJ~3NSxd%
zx?V7qfrlZDL4YBHL53ldL4hHAva8ra(E<i;hC&7*hGGT<h7ty2hEfJ=hO)`O#qwFJ
z7}y!AC+CaXv(_`PGc-)zEN;Wv!ob4NI{AyZ4QnR@3q#jrQwe{;eg+nX2@Ko}6B&dV
zCNYRJOrAVdqEB%K10Tao262X23>plx87vv*Ft{_!W$<B`#}LFYpCOE4!DJW7MVw0*
gSQwTva4;;J{9e+TbtMBg!>Y;VQf`bzlk22B0DW3Mp8x;=

diff --git a/build/classes/java/main/controller/PersistentToggleGroup.class b/build/classes/java/main/controller/PersistentToggleGroup.class
index 5ccef4da42dee9301d32078f998d43094c421149..c0ccdd01abe3a42a581528ab9898584f819a2f12 100644
GIT binary patch
delta 17
ZcmaDO@<xQ?)W2Q(7#J9AH*%zK0RTsY2CV=9

delta 17
ZcmaDO@<xQ?)W2Q(7#J8FHgcqJ0RTsn2Cx7C

diff --git a/build/classes/java/main/model/Board.class b/build/classes/java/main/model/Board.class
index 964278193ef90b7d61ea16d7819580a1bc368733..9384d2b533b1eef09f28e2e08c82c467056e8b53 100644
GIT binary patch
delta 17
ZcmbQhGJ%ET)W2Q(7#J9AH*#<=0RTB<1#tiX

delta 17
ZcmbQhGJ%ET)W2Q(7#J8FHga$<0RTC31#|!a

diff --git a/build/classes/java/main/model/FirefighterBoard$1.class b/build/classes/java/main/model/FirefighterBoard$1.class
index 4cd04d06ce08a8f36d7801f91a602b10889fc2c9..6409db7318c1ba27d3cff0b88217c68814c59e1c 100644
GIT binary patch
delta 17
ZcmZ3$x`37A)W2Q(7#J9AH*(Bi0suUs1|t9f

delta 17
ZcmZ3$x`37A)W2Q(7#J8FHge2h0suU*1||Ri

diff --git a/build/classes/java/main/model/FirefighterBoard.class b/build/classes/java/main/model/FirefighterBoard.class
index 4812b56b843e3d51e3a8b2a226c754607ba01af7..9811c05ced9e9a54051bf03da00676bf04938a51 100644
GIT binary patch
delta 17
YcmeA(>oemx^>5cc1_lP(jT~&!06!H4=l}o!

delta 17
YcmeA(>oemx^>5cc1_lO)jT~&!06!!J>i_@%

diff --git a/build/classes/java/main/model/ModelElement.class b/build/classes/java/main/model/ModelElement.class
index f094b21e4d599c59bef27eb5bd59eeda639bc897..6143f150ac592a530892fd585d60cf42c6d07aaf 100644
GIT binary patch
delta 500
zcmcb^-o?Rn>ff$?3=9mm3}zF#5(U{98JPY2LpT{28Tfb@_!$Hy=BRKBF$l9W2=Fk7
zFo;f^t;j9TAi>Tc$-^MUAU*MTD2F(MEDwVmgZyL_MomFk4hBvR1|BX3Mg~<L1~mrt
z&C!gajP>FS3=Av|k_@a2Yzzzzk_?<sng>J+NP#S3U|?Wn;AGHXP-kFd&}3j>P-0+Y
z00FK|47}SI1P?F>ZD3$vU}Vr@U|?Va%ds$UGDtCKL)DuwFo8w6gc!AUFo+#sU<9dW
z0;#WuYtUg}VBmo$W6)*LV_;xl0=b=m32dby12Y3N0|NuQmbT1x2APduX=M8l+SwWO
zL2hR-0IM++-~xFT>Johh7Ldak#M$;TFh(+OVyI^hj%3-yz#bgQx`}}+800Qge{e7u
zF&IL1dqH*U?Pg$%6jET`&Y-xNff>wEVgYm5!5n2)Fo$aggUV(GUXWWMW^yqwfx}Xr
SfrWty;yx}0V+IqjLrnqwjWW^z

delta 453
zcmeC;xWmqM>ff$?3=9ko3`P^V5*c|X)~ImvGYGIV@bWMSG6+pvt;j9HAj-}l#={`a
zATjZJD2E7x6c2+mgUn<TMom5`4hBvx21W)&9tI@_<;{7FqKx$-3=9m+4w4M43~USx
z4w4L<AX-3*fro*Yfq{XQfs;XnL79P(L6w1lL5YEp0R*@<F>q~T;5)#;zkz{)fssLt
zfq{VyEXTsY$so?44pnc$zyucM5@OWa!61Bqff1yh30ZwTg9ZZw0}n(QgC>I(0|NsS
z$iWOuU@Hw7m>HNE7#P^Kv}Lw4NNxm6Bio12&d#6>ayx?#SdFd#7s!)PmuNDufE>;s
z$hwz-F_L)`19NaB%O(c);5?9vP<_C`pvRyK)n^OUr?{JeF;YmDc{_vLW(H<3N1g@D
jVc)@^u$h4i<S>XaTntR$fRkciVPJwfMxVg|>?lJ36?H4)

diff --git a/build/classes/java/main/module-info.class b/build/classes/java/main/module-info.class
index 7a769b70875d147512dd0dc3f725d1c113981548..022c1fa844a25744d0a811cb92acc69ae1261c3d 100644
GIT binary patch
delta 27
jcmcb}beW0c)W2Q(7#J9ACvwEGa~PWI8R%I|%zg#{il+%e

delta 25
hcmcc2bdibU)W2Q(7#J8FCUV5FvKblZ8BEN51^{~32-g4r

diff --git a/build/classes/java/main/util/Position.class b/build/classes/java/main/util/Position.class
index b01c34770ddcee9fb9247441aa31c14fcb6fc662..5839ba1e53fee0ea3615bc8fcef03daca11a422d 100644
GIT binary patch
delta 17
Zcmey)^_`33)W2Q(7#J9AH*(~&0su$J2DJbH

delta 17
Zcmey)^_`33)W2Q(7#J8FHge>%0su$Y2DktK

diff --git a/build/classes/java/main/view/FirefighterGrid.class b/build/classes/java/main/view/FirefighterGrid.class
index 7450774fa10adcd12566a08c493621a338c090f7..5a4f2c572ec7525c4cefc798574c27ccf56a2919 100644
GIT binary patch
delta 17
YcmeB>?~vy>^>5cc1_lP(jT{a906dEZ8~^|S

delta 17
YcmeB>?~vy>^>5cc1_lO)jT{a906dxo9{>OV

diff --git a/build/classes/java/main/view/Grid.class b/build/classes/java/main/view/Grid.class
index 3d42b97050079349780725b186452a4ef88502d2..ddb93c29851f2511e39a03e77db1a6ef7b1e41ae 100644
GIT binary patch
delta 17
ZcmbQpJdv5>)W2Q(7#J9AH*$0`0suN^1@Qm?

delta 17
ZcmbQpJdv5>)W2Q(7#J8FHga?_0suO81@r&_

diff --git a/build/classes/java/main/view/ViewElement.class b/build/classes/java/main/view/ViewElement.class
index b647b97da7f66593fe943a56f2dddce5383b5b24..9c06aa83b1e4b099999a2b888508175e41625a98 100644
GIT binary patch
delta 17
Zcmey*`Ja>H)W2Q(7#J9AH*$Pu0RTz52TA|{

delta 17
Zcmey*`Ja>H)W2Q(7#J8FHgbGt0RTzK2TcF~

diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin
index 9f40e871db1454f66acd6b65c95c2a1c341f8807..dc869a1772e567845d90e803120a428499cf9665 100644
GIT binary patch
delta 2062
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

delta 2062
zcmcbyl<~$=#(H4}H%2!mJ!Xc^ywvjC{FKxj7KTPvhL+5tR5ph8%=C<s)FOc`D~<%H
zBzOvZt@(6vTG+J(>`okdoD6Lc<y;J{`H4j-0s#~9d>THLCq7+Oe5dZ*wZq&_JZ>Dk
z4BeSUsc8^%xC9(qZth+pbcE^D#@q-~!)-x)^(x%_3{8dt`!c)@798Gj=5Py(w3X=A
zr2?*kVM2Ps46S9EspTvp3@w?d<)RGjIjOm+c_ji{I+PAxkTDQ+*xT}~N>funOpjTd
zp*6E4HCN#1)Px|>wt&`&XPh|_$`^V{I7{kDF?1*A=am%Y=j5aou}Cv?!8ro;FI*g(
zId4}oUF(#1Gub0UO2&;zmZ2>P?4yfq6T(hP9k#n{d{jR8oWv73XC`@umc-&z0o}j5
zwYL6dmPv@z<F#7aQL5m|q{z@yQIeULUYc2)ky<3ctCL(%_CT47t?!mj(VXWClo)!_
z5FsJpy6TwSZ1WE*>dSTp`DEO9k*Vyi;wHqa%Ft4jnIaH6_uQJTf6V3XKRGPqG3%GS
zT7bHq219FUNoEd<CPPPlab`(oexAT2Rjnh-!pi?{{lh+0sFdf4maDcehYmw4C>BKp
zEDcTwE&Q>`WWGys-NJx3*BJ$t?Ym+9dktT5P}3t0L!+G%y1sgj!TNdz3@wQT1uTXP
zote3%If*6tMMexQiJ5r<EoK|pGF2W%=$`jplBJbnW9%-ZDiGXYVSZf0QP!;b?!mv$
z8x~BqWl}Z_ndWEhnIx@n!ofdn<=4tQD@Q$RhVFuboXq4zuv6cbPko~B><#DZMYGq>
zK2yGU@<b+oD;8&lw$hT4{5(bmMhOOXMg~T11{Y^nJvTjjcZRlt#LT=B77vEj{G9wE
zMn+{u0S3<iFFkKP2Mw0VQq0B%EWr$IiFsv-#f%J$$_!$Rj1tT;3XBXPKB2y05#eqT
zdXah#Q4FnV6}dSqATYU>S*o7JnvsFgiXq-TA;i|gl95q@(S$*Ukx_z$L4i?>L4lEh
zk%1vGI7u&A&mo1Ot+*sHJ(VSup%p}fHL5W(N^ml;bIT|wGa8FAXfZNL@Uby)%Ybw<
zGBQapFv>6(gN#*XNb^W{&Ctu#bI4+7OD#*yD`ClIkZc7pav0hZ^HOqBix?Rt7#MPc
z^YrXlChN1vGO|qeWwBvoncT&a!^krEJBy|a16WBvqgy-U1V)C|qQu-(un0FJBj02j
z)@DYQ$p=^$akH#pWN6FJ%quZwnVid}%E&T#GFurV%VaM06h@ZG`Rq30EY}zrTJuZu
zQm!*HbfqSjB<7{(q#ChIKE$ra#KJQ96T1o{%Vcp5Q;-`tj2KxaH*id0WSK0=8O_Kt
zxsWr8nT3UA@;Ocw9+nAA4DD%YnR%(kER+9%rK7l<8CfRJ<MLr-nf#jTG$YI8?cBDE
zER(--8!)m=R^!>D#3FF0LwZWfRTl5bT1vMV`s^(3F*)963VFb!_mD}?{u~p_WENg4
zMwZF;yul#H^L8+@OqSs@V`P~e%r}dXW%4_|wT$wU=kRwjvTRlpFk@t7nH(!9$H+3d
zMlc-gv}=OR>?~KA8JhA~CMO83W@MSnBYcaIW%6@jZ$_5M#v-9iEG(P5M1(;)=ZSVo
z$qQUys9CS^{-IU%#P9r#x@$JCU<p{sq7uzA*-`8Tqx@to@g9&z#Pb<hCaX(yGO|qG
zDB&W{a*|2F*X?vy0HgMS<;J~pR%K1nyuspflO^CX<6TCU$s&@Lpy2eEH0EO2#{8Ux
zp*gjHWpa;X3?s|tmy-S<+byLV809DLk}hUsnXD%R3b`T~P&h4?*~Z8+IZAdZBg-T?
zkfVL%<}k8Mekliv6M6Z)j4YGy%4aaLOm<TMMR1M+$YpmFK%pkCXvoMi*;7%8k!5m@
zB1rEJ#db!P$qq`38CfPjQ8EXGrZOl>qLif>Stge$gVNVyWss{JR3?L5bw$;NMSeF6
z%VZHXJw}$z&T5h%(OC5?MwZDZ)Ir`4(nw*HpS)e8ijifqktQgDc5Bu%vP`zt+Q-PU
z`IlBANJEUyOGf$0Zn}#ZSvJ4Yoe2_Z(a&LHdB!-6O@8t>eOE@7$u<U)8CfP@FwkXW
znf%WnSy^6S&8L{wlzFTlQX*v+1hz~(x0l0XABXFH4wVBOj=!02FtKcIG4ueLb=GJG
zC@ZsU&NTJ{@wb?`GRjZ>Wuni>GFi(sgHe9+WYZIjESqD@UNJJVY<9QEV`604yv?c<
z#M80iU}pWtk$Z`KvZehe*30Z~n9pxEa7bpBdc}T<={d)3rVlJTSbCV6Ik&TJX8ytS
zh^?Jv^IGR_M$Sjf=b6uPv@rH=c66P`&R({K@dHaQ>*i-Z%bA2OGo4{>VO_?$l5;Zq
zQPz*_UzjG(_dm)piFG2&P0l;an{xvAK`yNcl(1oDk$ua_z`(#L^N~~U6Q|Q>PJK=m
zE{G8O7f!veoNnJZ-9B)#vO&ZczH{pR;B^1VsV~ej`9h$Y0E;w4LZX37uaQfic`{p&
z10&01_aFyVh%rpud{emezHvg7F;3;uo5tn*fm0sBmz%sMNJ2yr!ckxZxulm7T$}&^
DLrZYG

diff --git a/src/main/java/controller/Controller.java b/src/main/java/controller/Controller.java
index 5dd8dd9..fb20711 100644
--- a/src/main/java/controller/Controller.java
+++ b/src/main/java/controller/Controller.java
@@ -69,7 +69,8 @@ public class Controller {
     List<Position> updatedPositions = board.updateToNextGeneration();
     //this function calls both update firefighters and updatefire functions so they can be updated to their correponding
     // new position and sum up the results and returns them also it increments the step variable
-
+//         // (*firePositions contient last fireposition after the last extinguish and new fire positions +
+// *modifiedPosition contient Last fire fighter positions and New Firefighterpositions with neighbor of every new firefighter)
     List<Pair<Position, ViewElement>> updatedSquares = new ArrayList<>();
     for(Position updatedPosition : updatedPositions){
       List<ModelElement> squareState = board.getState(updatedPosition);
diff --git a/src/main/java/newmodel/Fboard.java b/src/main/java/newmodel/Fboard.java
index efd4721..b7b4524 100644
--- a/src/main/java/newmodel/Fboard.java
+++ b/src/main/java/newmodel/Fboard.java
@@ -31,17 +31,16 @@ public class Fboard {
     public List<Position> updateToNextGeneration() {
         List<Position> result = new ArrayList<>();
         for(item item : items){
-            if(item.getID()==1 && step % 2 ==0){
+            if(item.getID()==0){
                 result.addAll(item.update(this));
             }
         }
         for(item item : items){
-            // Remove Extinguished position from the results
-            if(item.getID()==0){
+            if(item.getID()==1 && step % 2 ==0){
                 result.addAll(item.update(this));
             }
-
         }
+
         step++;
         return result;
     }
@@ -66,15 +65,14 @@ public class Fboard {
         }
     }
 
-    // A revoir
+
     public Fire getFire() {
-        Fire x = null;
         for (item e : items) {
             if (e.getID() == 1) {
                 return (Fire) e;
             }
         }
-        return (Fire) items.get(0);
+        return null;
     }
     public List<Position> neighbors(Position position) {
         List<Position> list = new ArrayList<>();
@@ -105,16 +103,19 @@ 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());
             }
-            if (e.getPositions().contains(position) && e.getID() == 0) {
+            else if (e.getPositions().contains(position) && e.getID() == 0) {
                 result.add(e.getState());
             }
+            else{
+                result.add(ModelElement.NOT);
+            }
         }
         return result;
     }
diff --git a/src/main/java/newmodel/Fire.java b/src/main/java/newmodel/Fire.java
index b9cfad7..9675660 100644
--- a/src/main/java/newmodel/Fire.java
+++ b/src/main/java/newmodel/Fire.java
@@ -26,9 +26,13 @@ public class Fire implements item {
             for (Position fire : firePositions) {
                 newFirePositions.addAll(board.neighbors(fire));
             }
-            firePositions.addAll(newFirePositions);
+            for (Position f : newFirePositions) {
+                if(!firePositions.contains(f)) {
+                    firePositions.add(f);
+                }
+            }
         return firePositions;
-
+        // firePositions contient last fireposition after the last extinguish and new fire positions
     }
 
     public ModelElement getState() {
diff --git a/src/main/java/newmodel/FireFighter.java b/src/main/java/newmodel/FireFighter.java
index 91a74d3..31d40ef 100644
--- a/src/main/java/newmodel/FireFighter.java
+++ b/src/main/java/newmodel/FireFighter.java
@@ -10,7 +10,7 @@ public class FireFighter extends Extinguisher {
     private ModelElement state;
     private List<Position> firefighterPositions;
     private final Random randomGenerator = new Random();
-
+    private List<Position> neighborFirePositions;
     private final int initialFirefighterCount;
 
     private final int ID=0;
@@ -22,23 +22,40 @@ public class FireFighter extends Extinguisher {
 
 
     public List<Position> update(Fboard board) {
-        List<Position> modifiedPosition = new ArrayList<>();
+        List<Position> modifiedPositions = new ArrayList<>();
         List<Position> firefighterNewPositions = new ArrayList<>();
+
         for (Position firefighterPosition : firefighterPositions) {
+            // Find the new position closest to the fire
             Position newFirefighterPosition = board.neighborClosestToFire(firefighterPosition);
             firefighterNewPositions.add(newFirefighterPosition);
-            extinguish(newFirefighterPosition,board);
-            modifiedPosition.add(firefighterPosition);
-            modifiedPosition.add(newFirefighterPosition);
-            List<Position> neighborFirePositions = board.neighbors(newFirefighterPosition).stream()
-                    .filter(board.getFire().getPositions()::contains).toList();
-            for(Position firePosition : neighborFirePositions)
-                extinguish(firePosition,board);
-            modifiedPosition.addAll(neighborFirePositions);
+
+            // Extinguish fire at the new position
+            extinguish(newFirefighterPosition, board);
+
+            // Record the modified positions
+            modifiedPositions.add(firefighterPosition);
+            modifiedPositions.add(newFirefighterPosition);
+
+            // Find neighboring fire positions
+            List<Position> neighborFirePositions = board.neighbors(newFirefighterPosition)
+                    .stream()
+                    .filter(position -> board.getFire().getPositions().contains(position))
+                    .toList();
+
+            // Extinguish fires in neighboring positions
+            for (Position firePosition : neighborFirePositions) {
+                extinguish(firePosition, board);
+                modifiedPositions.add(firePosition);
+            }
         }
+
+        // Update the firefighter positions
         firefighterPositions = firefighterNewPositions;
-        return modifiedPosition;
+
+        return modifiedPositions;
     }
+    //modifiedPosition contient Last fire fighter positions and New Firefighterpositions with neighbor of every new firefighter
 
 
 
-- 
GitLab