From a7df92ddb298107e4a2a0a2891c479f90a126e48 Mon Sep 17 00:00:00 2001
From: m19023837 <chadi.mansour@etu.univ-amu.fr>
Date: Thu, 28 Nov 2024 14:26:04 +0100
Subject: [PATCH] Tests updated
---
.../executionHistory/executionHistory.bin | Bin 94827 -> 124550 bytes
.../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes
.gradle/8.10.2/fileHashes/fileHashes.bin | Bin 25097 -> 25997 bytes
.gradle/8.10.2/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes
.../8.10.2/fileHashes/resourceHashesCache.bin | Bin 25093 -> 25773 bytes
.../buildOutputCleanup.lock | Bin 17 -> 17 bytes
.../java/main/model/FirefighterBoard.class | Bin 9885 -> 9131 bytes
.../java/main/view/FirefighterGrid.class | Bin 2869 -> 3014 bytes
.../classes/java/main/view/ViewElement.class | Bin 1465 -> 1615 bytes
.../compileJava/previous-compilation-data.bin | Bin 21348 -> 21348 bytes
src/main/java/model/FirefighterBoard.java | 20 ------------------
src/main/java/view/FirefighterGrid.java | 10 ++++++++-
src/main/java/view/ViewElement.java | 2 +-
src/test/java/model/FirefighterBoardTest.java | 8 +++----
src/test/java/view/FirefighterGridTest.java | 12 +++++------
15 files changed, 20 insertions(+), 32 deletions(-)
diff --git a/.gradle/8.10.2/executionHistory/executionHistory.bin b/.gradle/8.10.2/executionHistory/executionHistory.bin
index 051fd35cbd1aaf2f2f60edf3b880204cfcc98c2e..73f5c656ffc9d5907e18817f756a67622bb73984 100644
GIT binary patch
delta 13519
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
BC%^yz
delta 1489
zcmZoW%l`Ta>jV*5CI&G0U&X+{H4n^WxV(sgK@G&z-RO8jd}4sWWJw8WM()j~5*&;?
z|Dk|^fl(49y)i&Re6ynmlarlEepXScQJzsrQCekAhEaBAnu%FvNpW^*uE41;&g@rA
z^FCjjl3yS9>6qUfCJdp?ja^R#gtU%4tyz-kUlBR8c*mKrJ&zgZOn;cfC^k8MHtXie
zvt8MQ_V1tg{Q8#zqEF&iY<n|zJqP2g>4NHvqLcqGd@sO0WBS$8+qfr0<cb{YlUTNF
z^1nq{0^FHv9mV^v`!3pU78}jAU3B_+YsUJ?2EHtle=lCka(L#0X`9z9VPoWc`DWU7
zqg!l@)2HVpGm6PD2$Wcf+RiWXJw3Z%daFrYOUN6rin+dwizXX}DsJXm#>*%WT74>E
zLUKS>fa0RZS)1-mn5?~Am8Ip?n`x6nmQR!TS^rkz(yUV-UfuW<^|<B7l$Kc!rfoOc
zDmM9ky4+-i6|#1_7X%i)n6Nga`S!fyntNQz|G!;4b-U3{Ze|97$mux&tWqXEl8Y3w
zr@hKP$;=?I)yZ;w^sMAL`syNaJL4bEpL{VzbGnW#W9j6YRP)UND}@<F=I4Ls$lDr~
zdPD2Cpq`v{%cfUvrfn`?Rg&eXqcl4sw<^uNxFRJ#EwRMBpfIH@Evdw~ILkOQS73(7
z-vtlfn{0EKDtxWp$D-*YGltOS#x7pA=~mK=8H|dP6M{0Q7ql=c2yFbemV18pv-nyw
z_ubpxFa1A#K?|e8<g-tkrXP`E)SR3go;f|CjgfnD&T}E5i&s`EZ#A+z?mg4iMrSsw
z0^^*?iO;1cuYNvpy0{#p#pLe|Ig=X#1*Y$lV^p5p`LcO>xIClQWV2W80(P#CV-A_b
zNIVI%tgPdTN}9YOc)7qG<_x)0j>{@a6gU(3W-JSs?wi86Ngy%Iy3^tGy=^C+l^9L_
z|MJfC1Vu*8$@y=Z1im%$?R@(y_=;Dq^0xybUwtMszFj1+So!h{p=&qa?d4OtWpsXn
z=k%I1#>E0W3C2lFW>xBVSsm+fGjEcauAk1hV7h}cqwe%S>5MZ3zMlWQ{?b$iABo0&
zzr_6AwoTp_u}|Rp9sRv$|47|@=R9qB-&N~vlP@+bny#bDsLc3#a${WB<bq(K$^M^M
zr*BYYG@ZUai?L;Tj2ff%<O|KM0;gvRJbt&bd|Ped=Rc<wJae6_5Ib%940T4u>2kS@
zjRGQ)HQHZhEXb{Unj5%S@!+)S>vI_;CO>>QW%AsKa+76mJ4~0q$rw1<XA+1rdGg;$
zg43h47`Z1`?=qYow}3Hb`X?<$IWSMblu>5-yW5Om(>H4)gmR|m=|Fh`_Za1-f4IjO
zIo(7TDx_e_C_R0iE@S%SGq<~^PtaqOnOwa~clvvC#)RpX`d~$-(*@=*hEIR250*2W
zZeYMz!T22NYe69aj!*iA6^+j{CDZy}JXdZDe=@l-E@ish4Mv&GZytVOoUV5Z;o1rm
zhZezj9bg8`d8J?;%w?X_-z{a7nSADU=j06)g3~uV0GkGOV$J00U8d6)STGiXbr={h
zrc7UE$=JmBcXDG~z;pp?M!xA)R*Z^5Z%uE{u5jf4a<n?ody4wJ|BMU31<&*eR*anB
z2m~wE6>4*QsiOS;*#kq(_-Y4}ekR6wpz=p#x_lEOD@#^lS>ogg`-4E{@(K$4o*7%W
z(5tYvewy#wF45idK}C-SBwVI9>|qp~9%RF)W;^x1qm{|bj-s%DUD@Rt%Qm)7oxRQI
zy8ttTK<~K;#=GQZ8+?Apdm{Pn*GbF_0%?zH?tW`H;FcFKjcq@>;-1MDQ&w+ZX3u!k
F2mm_ag{lAm
diff --git a/.gradle/8.10.2/executionHistory/executionHistory.lock b/.gradle/8.10.2/executionHistory/executionHistory.lock
index 0be82c63efdc8504b711e35446e2a45e13b056e2..01305c5a79fb3335d4212cb69cec6ecfe9799a7e 100644
GIT binary patch
literal 17
UcmZRsO8#f>m)m%p0Sp+00W&=WH2?qr
literal 17
UcmZRsO8#f>m)m%p0Sp*f0W&WICjbBd
diff --git a/.gradle/8.10.2/fileHashes/fileHashes.bin b/.gradle/8.10.2/fileHashes/fileHashes.bin
index 27b724348ee342ec8d4b5724953555a9bdf2bde5..5f6ff7684485ab0401d5d71fd8517f8b3ed6fd2f 100644
GIT binary patch
delta 1562
zcmeA?!q|J7af68j<Fw7D5|)hoPI4}<I}g2M0E3jtlT#%F`8&_gzPa(vC9n`f^54m8
zC1(h%2#_-GC@NBc2qw*+Y%8@vV|(^T7Af9`1yI4<|4^`_<51HZxx`Zt@nq)7Po-w^
zhm~v=eKzeJL@ed|<WlLA{EGsrMQ`oD2oX!-oNOwS$<OxHdZzNEmr${blc&l&5cu%<
z_BD~WpKd_}Q#Ci|$}V7xVBgWH^KDMDA4D`I5o-H?{yS<a<!RE)5b@;GFmVA<s~LL^
z?a_ybr$)oY&+fOH!o92oBAz^RGpl?Dqku_?dXjbcOKym0%F)TK3O@u~qYnkn)SqSm
z5ll9nT&ifv-xTk@u;J1|h**mL=B0{-jQo}tgTLNCk^vD+PT$O{?8wL;eDz0%)J9{7
zV3PG@SCuFxKE;iSKg2g0{NUW|=&^-QA<(<4n0wB-xnH>bRyP*hy34@8IJxLm^(2TU
z%X5?ed#Y`=4qwL@G&8Hu{E5-Ng401sB{@txHiK1u%I$)v<TYYoV9*2ErOCj+pa{YO
z#S1umW8IfdF6hyTKd^772Uy4ZZ}|`%jE0k~Bi}QBDq6Z(H>!eB!R5`ZoYiF}?OBQm
zZ=)h3_JCEtn)M8#T6y*4T0gbTucLJtnO@DBEEOvqRJ`-EQka3zs+o)5t6V+zxE!qE
zQ_)_C1~z|82km~jqEWc|&YKUfqtYE-NKJw2*aXqReQdIQfZF7>vBu1wijGd69U!G(
z@T>09oXFnAu5XN_#JfXGAR3ApAsT{HCO5{ZZFY`3#+-oa^Zj8n_2O0^tz~?$_q6rC
z?xkRTud4GP`dC(DI?W<^Mo{IOMP|%Z8@Fn{F5Upv@hNvXL<i&B$%>)E_3yql+<R7?
zZMXUs+tr=3W<k`HKodDfAEv1u3fVJ1u$gX7%cx$_a?O(&s^ba7ROaiLIyz@xzs7&5
zEiXjQJhsPiRV_rvxkiu<GX{ogkU!C)dG%xK{=!QU-IYta%O|=2Z31ig%)T9@g#pCL
zjZ|YP`po=sa%_-Pz4rX*>4|F^KEE%wl9FGy;XX(~(P#EO5Y^z2MKiyD^TySxHcR_D
zTbYbx=g)Bl>-cng0z`)hC?lcia0<N|fAo&Q=?iZY)!!*p*@AU^W`E7Vz);V?z`&`1
z>2L9g4+Q6zzfg`{Rg+;9$C?1v^6B<sh$UR1m^!W{ZA<Gu-F|lu^YYA#T)f;+9djT$
zSU{;9%~^RGAG_+8Pc%MN6LNLa&Q(`)pjtp~Vqjok|A=XciJ0({`oE_YF6~;Dzjn{=
z3^W}(F?H~JzUUQg`d6cu>Ug<YJrEk@w*w*0VvK!=sl|W)lh_OGyMqna6_&h^nC%a?
z<TLv>h!&3Lm^$1mQ=Vj&hO-wfJ#u}1XTln&j`x!jJ*8Cq(o>&jT3&si>M)!8ltAbN
Ns3bI*GA#lb2LO;b<um{Q
delta 399
zcmeA@&DeQ_af68jW6Ne!2}{PwZIT|7pGo#l?v+|GIaPY%WImY#lb^{XOpcSizS&o9
z2IFQ|g$BmScNITOeyU`+Sx-5Gaq~JA3&zR+R0ElK3O6eL5Z`F9f_t;0#}+;XKG&tE
z&Mr@xRL+`fH1E2HEdvAN<f0oKi40(1%QpGHr`l%g@O6w5DYGp(wpYI{eRq`UmgQl#
zZ(x<zKDbYw7$v1}@h?kVpf7*ll<b2$6WgRegC%D>z6YDaz{oV&I`Td94W7fBb)za6
z6-ul`ZRZ#Ho}OJWz15_yB?PScw#gfaYPGqOYyH$VzmC>rWV&rKSt?dKX!nA^q8Ag^
zhBV)vcU*IiOF3A>if{iR8d!HSFfiyDGcYh{GB7YGg0R5P`nM97W}W)*>c*$2$1Ojm
zfOXv9Wr676Hl1uApf-7JtTFR#Q<llI1Edt@=YQwO+ZvU6L+iJoo}6_HSi@~oBZ!9J
Pl*x^8YMY(ojxhrOm8FoC
diff --git a/.gradle/8.10.2/fileHashes/fileHashes.lock b/.gradle/8.10.2/fileHashes/fileHashes.lock
index e68c6953a46e5070226bdc0295ae1d3dd8787e56..1f3117a7e6e764418451701a2f7793e3994ef72a 100644
GIT binary patch
literal 17
VcmZRUE=)E0=%H|g0Ss8r0RSii1Q!4R
literal 17
UcmZRUE=)E0=%H|g0Ss8X04Ki#(*OVf
diff --git a/.gradle/8.10.2/fileHashes/resourceHashesCache.bin b/.gradle/8.10.2/fileHashes/resourceHashesCache.bin
index efa19decb6e32ae5cef9eac1e52b8b7bcfa7c061..c7f8aba72b9fe6b90a63279949156eef2887337b 100644
GIT binary patch
delta 1005
zcmZoY!npP%;|3E6#%r5RB?_1XX1`h7{>5;M5(5|{sc)Vub%9Y}J>$}f(@F0afdv_o
z_fJlhQ4rX)`tEU+B41&MV2b<XS{Vz0osB%#Grz5R1`$lIp1fAZLSV0M$`j8IR!<;;
zN!gR{%4`rgt$gO+mhhHY5W(b!lUrqH@@IyJ<+*G8gNn_aEGpNaaYsJugB!!nOo(7g
z_kSq3*CcaOap@!#h<I}3=3co1MvZsUqOv^}M_8ev=1|4|KQK3(_HVtW4-rqvocvW@
zkzeuU;%9TRoFQUK7bo*7Y!LX_uscn7U6LR~FhzCpR)qk8zf3`kjs6z0Km?OTH~&>w
zz$n1CPx$xu4ZHqBM3Z_qPgQDQ7I1QF7D@Op!51p(xtUjO2ctl+R)bAe!joL6==#Zf
z)gK5XufAO(pk+A`BACKFd8)=q{*c8P>SwoYg@`4wP7c)!5Ga<B$ypUOEdna|dGcJ%
zOH3k)8x?<uZ#4M9yxGy?h-8v60|SF30|Nud>4E}Bbf&*_H2C)M){UrJm5mia3=9l%
zs46NnZyn1$_qRJ#`^Bd_FH;LJRmic(n@wI}?A&qHTT3##Q)cqV1YyH7+b%hmzcA8T
zFCK1_btDB-m*Kp)D|_2Arx=Fpb2-Ntnm74<ph^9uzXdG8C!QUeGtXAs_sZlxOl|jS
zxF%Zum@)s2)=%A&*S;xWs(2yAm#yj~_&6qg>Xn^0gI;2)n4Yk<VWTUj*P1R#8()tZ
zo8T&};o(yKDRRcShjk~OZ@uPtykJH+TnSu7o;SBlyxx{IpP2LY<IPvrO;!#xnfy0Y
zss6SZx7Y#cm#;qMr5>)^)?J3Fb@5$&iJAB2J1j2hJA10@_!>+VrapVzzUm(RBY!Nc
z)<~P@0j7#&=a+Gc1;72;*c<Wu>ACxe0Jev_uw=Kao{O@E*Sd92?RU-Yn~iD6^TzW6
T29p=oWiZ9cm;Nyar5iZ_OCC3h
delta 109
zcmZ2`lCkv&;|3E6#zUJ;B?_1}@0B{iIC-v&#N@Lw29rf)4JOCRu9z$<H*xYYx$@1q
z@)?YiSrsKGn<*}z{8iCobEwh`#?7oM70jEbs&8PN9IJU_vai;`$!gl}lUub<F$p<t
RRQw^n(clK_W=D@Bk^thtDTDw3
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index d0e0f9f97184b7335603179be1962ff8f3a3232d..95ccd3a0ea82d0ce1f4b91f7c0c51ec34b2256aa 100644
GIT binary patch
literal 17
VcmZR+;bwJ3Kx+R{1~6d!001!o1kV5f
literal 17
VcmZR+;bwJ3Kx+R{1~6dU2LLe71f2i?
diff --git a/build/classes/java/main/model/FirefighterBoard.class b/build/classes/java/main/model/FirefighterBoard.class
index d90530e8d72b19736694ba88f2525b738af4bb8d..439370a9cf3e81f943e985a67690580dd7b49b3b 100644
GIT binary patch
delta 1932
zcmbR1yV{-W)W2Q(7#J9w7$Y}wUFBkCXJnYHz%9bV@Sl;1hk=!mnUO(#@<c(A$?Pmb
z++kb{9E_|yjBJeTlMA^`*f@C@xfr=8ujV#n<lTIi`!OS<+UA42-x(+O3yAXaq-7SR
z2ILoKmSpDVO%4!{*t|sG4kM$_<VGPyK0hu-f5rfI#y}p1_l!Z4Hway331wtZoqR_~
zm6@F}eDZo>V@96IkA=PK`4|`&m>BsPm>A3$%o!LNA$$P_CI)vDz7T^ggB@I6kU@w+
zlR*unm%)+204@$P#|1?n6N48TpPPY)fq{XKfsuigVFn8WBcssdjUtN~g(ruKhVzRs
zFfhb0a56A3Okxye6q~$TG@4Opv$$9%Bct%-h2r`3AO&d*Tnt<c`i$ZXJPb?>)^Ju1
zoHZBDItOR{hp`x~7|a<Z7<d?%84VcR870A{FfdktEM#C{;9x9Zlwy=-U}ThGU|_Ii
z5ctc$#m?Zz_=`dB55wes2@6J{$tNW08HFc%NXn;x+@r<7!oa|g2h|T^fy`tCi-GK6
zV&Gs%W0YkuU|?pHV_;z5VPJ%aF!D1ngKgnvVEMx!$Ig%_DlH9-0(k~TQ0y}>F$!%y
zEy)V<|3xWpXPA8o3}+Y>7@8T_7#JA7z-|7*sK}@UHvJ8wGJ^pF6Ow&z7?l}S7?>Dk
zCdW&Q)vGcxGBEsMuwiG&lLUcZ43a+>SfO^SGcYm;G1P$KhJk@WpMjA9<QZ12Eerx{
zKyl6}%)r3F1{R#i2yzj~M+^+CP<Jpg@MG1?i_n|^(LD{DZbl8Py4exBA)04n)vO6}
z7^BeS5SfLH!jr$rn1hpy7y}an1H%NU19cga8MPR-85kLu80Ir90EICF14AJL69Y2?
z0|USIPKKR~4B9$78TK$Sgl}YEU|<IOm=7$yo`H>F0|Ot!MzHk?U@?BE!3+%ij5>_E
z;E>^G)MM0TU}Dq-MLEQNkR&KHLCW+P^%<C;;SI__Y>ez6cTB!1JAqMna+aJn*xjI{
zWys(Kj%rXMtA|@u&u9qBcnk~-_25WHL^VjnkWmGifW;Wt{xHb0Go1XxV8+gn$IJVR
zf$JCCW+MhhMq`F0Ae$K&n3x$jKnaRbZ4*Porp+Sq>Y!9-qu?D5ienQ7R)&2Hk&Gsc
zrVOkM1`N+(j$%}UI*ON3lF<z8C{ad1Mss-j19=`S2XYhxSPoR;Fv?86r=TYYDRC?q
z7#S@g4w)>kY|O>*KT>xSL&J7P#>p|t8c=R4h<gCe?SOK{A&NoVoeT*~4B^ZF-`3i~
z;5yk*MH;HJ8>Cc41!hnmh#RJ&Q4i5MaXTX;T&MO11_lNeaD>M(h%+!S++*Nic*vm2
z@QA^j;W2|1!!w3(hUW~K3@;dR7+x}TGQ47#&G4FG9>ZIP-3;#-&N94bxWMp%;Vr{Q
zhW`wo7?~J8Gs-i3VKij;%4ovyjWLknJ7Y4#55_cxUyLI4(Be*&L5R_cQHg<>A)G;o
z(HhL^WDsJs0kd|)S#KGH7;QmfjPeXZjCNpFAcGL2J&47?z?cDz2@b{tMh8$#Ao4#*
zgwYY2C|nr${xS%$Gfb{gwS!gxP6CdMY>dv3l)zxZzzj~<Tw2-(7!q~1F|vTN0TVb>
zAi0kdoctjfp9^9wqYDEA11A#$g8%~v3pg@zF}gwxG+<x?XF)bC?QM)4pdf}BmI5kU
zkWFJlGL4lHWD>k!a$|G{mp>kio}fr#U}Pv^^a7RH42+Dv42+E4jKK^H3_=V{3?&R8
PH*he9ForQkFh~Lb-$(+_
delta 2636
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
U6GI6DsHMTdn8=vSn93jt06=$+l>h($
diff --git a/build/classes/java/main/view/FirefighterGrid.class b/build/classes/java/main/view/FirefighterGrid.class
index 2b66bfdf17fed85e7539d1b0a714e09803e4efaa..f8689dddb9f3d7f8bc408a1c0db69f5a41101aaf 100644
GIT binary patch
delta 179
zcmdlgc1)b>)W2Q(7#J9w7`ATYddw!0o?7CZpHrHfSIo%3o}O9~lwV#v`4w9@Bim*t
z_IJ$n%?ykTa~T*I^cff#7#SECShcn=u&-fYU|?dH$H2hA1{Mrpn9sn#zyoHpGAv+N
Z$iTqB$gqh4n`T~g%^_GdZw6bj1pwM)Aj|*&
delta 36
scmX>mzEzCt)W2Q(7#J9w7&dR@ddxPNg*}9kWpgC^J7!h}1}2700Q7$gKmY&$
diff --git a/build/classes/java/main/view/ViewElement.class b/build/classes/java/main/view/ViewElement.class
index 13960325fcfe0d305876ea83d4af1b454e819c14..4ab2b334e3ac1fb502c67b8dbded51f09ca58b02 100644
GIT binary patch
delta 822
zcmdnVeV&Kw)W2Q(7#J9w7*Z#4wHf<|x^OZuGKlanh%&G-GO+vlhlV(M`hmp6c^D)>
zVyr>_&fdWw5h)%9X$F~zbCtN|806U*WOx`97!)U-Qsh=<P+@0K<zY}`P@niMltY<8
zlZQczL3?sAqZ*qo4}%_q{^WW_Ep8(QV|E4;9tKke{mEMx)!58Isw^fyV6><=VzB06
zuwl?=WMFaf33cUQ;NfI2VzB37Z~%!h2f4a%Fz|zfoOu{rKtinH9-bkt91KDrL3bVo
z50D^Rq^pmQe>ew&C`i<shrtIV%IY5E>gvbAAORBe=V1r{3G(=Ox_g8Kdq;w-;{y3E
zh=(DVA!KttlOrRmG6Mqx=j5%-8ubp6ppao;aF7Ir1_J|w0LVKG3<6T1uwY<dU}fNB
z2xSOiU}OkmU|>*UU}OLRu1yS*+ZbdIFvx9SU|?Wm2xnkmU<1p6)T=Q>Fff7Dn=mke
zMY)6+wRSKl9bjMtsb_+#uLoHW$-uzC15w5h#SqQFzz_qnn2~{@fq{XEL5snHff;O?
z2Lm$$3rMk+w#;@04K3ZR3_2SbKx#nt^D!_pFfed2urY8ma5L~QfQ%JmU;?RUh-F{{
zIhz3-Sq#iz3wW6s7_<byUIxp>flZ1R-~xpc)W4o!`xqDu1=uHlVNtA)<k-X@92_aY
zwuwP37~~aHuX8XYFeE~?PGMjL8(XoPfiY6ZfO!*x;dTbI%?!+7z9q{h1}iY19n807
z-NaxA=5vAhj%=G4oWOiuFyEDZ6NB6KV2}X<U;$5#O$=UO1;SvyFUU=PU;(im41t>&
eBtanqaUK^q6xbLF8CV&Z7$E*kVn_!2Hw6H03~}lJ
delta 686
zcmX@lvy+?a)W2Q(7#J9w7{VuVwedQJx^OZuGKlanh%$&xJgmem!63=bAjZQW#UMTL
zgCe&qgB&}9JP(5cgW_Zv#!wDf24x-w6$aJGm5gd^>O2e@44RXdGHUVZFzB)~=<zV<
zGiWk0NKD?yC?Uwmz~Ua{7|F%J$Y2Q4V>FqK$s$~b!IX!=45W(1$tTp6gMo*WL5IPT
zhrtRY#vJ78!ok1~60+rCumcIPhI@F1xN<NEfdn0S7@R<YY>}=$KK|h#vt4)?Tp8Rp
zA7gT4WR+!LU|^rj!=h2oAOLb21A~AR$YTr)46F>C4DJkW42%pO3=9lP42%pQz_p1%
zcpHQG0S1W;3=9m644w=O3~XRIka`6MF9s&CdJ_gFuqc-hqt*@vnF9=rAoWZr>b)5l
z7<eG680vi(d>I%R{6H2nGB7kSFfcKwFc>i~gH7{bU}j(esn*h#+0LM(rMs0uZ6gCn
z4aj~z24)5Z1}+9R25ts!1|9~Gxnc}VAoUFX3~V50Gk^o0ff;N8FEay!00RUwFfasw
z43cCB6yO4d3)H{XVEY&tlsP8HuqxJr9FOW*4u&9xV5s6^23D{o;ky|aBZah>H!)~$
zXE4~zzzpUavut880rT0xd~?=K3>IKM7npC&wu!+8%;yF3?b$amIDq*AI~bfdGYD^F
dP=y6G7uZ{D3;_(R3``K0GlVdNf_%Ub1^_f!R8ar`
diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin
index 687f3d658c2b5616b6cc79b89347e94a27d1cf12..88b9efe038e7d5399b7fc58d68ad25fd6a38d9f4 100644
GIT binary patch
delta 68
zcmaE|jPc1b#tAk8E^lt-tS&QY&r(cy8x<L`XQEF$fAP-GN?`^<t7a~KuX6R=<B7Y@
b@b7-PqEWc|&YKUfqtYE-NNt|Vcs>vSi$5b5
delta 68
zcmaE|jPc1b#tAk8C03%g^NV~>&n}qWYEst{GSMfVfA@mGq8Ag^hBV)vcU*Ii%fwx0
b_<z>FmAEwP)Q49$K1Drl`LTH_<M}`UZv-Sd
diff --git a/src/main/java/model/FirefighterBoard.java b/src/main/java/model/FirefighterBoard.java
index 55c698b..4255afb 100644
--- a/src/main/java/model/FirefighterBoard.java
+++ b/src/main/java/model/FirefighterBoard.java
@@ -218,26 +218,6 @@ public class FirefighterBoard implements Board<List<ModelElement>> {
return modifiedPositions;
}
- private Set<Position> spreadFire() {
- Set<Position> newFirePositions = new HashSet<>();
- for (Position firePosition : firePositions) {
- newFirePositions.addAll(neighbors.get(firePosition)); // Spread fire to neighbors
- }
- return newFirePositions;
- }
-
- private void extinguishNearbyFire(List<Position> modifiedPositions) {
- for (Position firefighterPosition : firefighterPositions) {
- List<Position> nearbyFires = neighbors.get(firefighterPosition);
- for (Position neighbor : nearbyFires) {
- if (firePositions.contains(neighbor)) {
- firePositions.remove(neighbor); // Extinguish fire in neighboring positions
- modifiedPositions.add(neighbor);
- }
- }
- }
- }
-
public List<Pair<Position, ModelElement>> getUpdatedElements() {
List<Pair<Position, ModelElement>> updatedElements = new ArrayList<>();
diff --git a/src/main/java/view/FirefighterGrid.java b/src/main/java/view/FirefighterGrid.java
index 16c1969..453da0f 100644
--- a/src/main/java/view/FirefighterGrid.java
+++ b/src/main/java/view/FirefighterGrid.java
@@ -8,7 +8,7 @@ import model.ModelElement;
import model.FirefighterBoard;
import util.Position;
-public class FirefighterGrid extends Canvas {
+public class FirefighterGrid extends Canvas {
private int columns;
private int rows;
@@ -75,4 +75,12 @@ public class FirefighterGrid extends Canvas {
gc.strokeLine(0, row * boxHeight, getWidth(), row * boxHeight); // Horizontal lines
}
}
+
+ public int getColumns() {
+ return columns;
+ }
+
+ public int getRows() {
+ return rows;
+ }
}
diff --git a/src/main/java/view/ViewElement.java b/src/main/java/view/ViewElement.java
index 0c4f09e..957df8f 100644
--- a/src/main/java/view/ViewElement.java
+++ b/src/main/java/view/ViewElement.java
@@ -3,7 +3,7 @@ package view;
import javafx.scene.paint.Color;
public enum ViewElement {
- ROAD(Color.GRAY), FIREFIGHTER(Color.BLUE), FIRE(Color.RED), EMPTY(Color.WHITE),CLAUD(Color.YELLOW);
+ ROAD(Color.GRAY), FIREFIGHTER(Color.BLUE), FIRE(Color.RED), EMPTY(Color.WHITE),CLOUD(Color.YELLOW),MOUTAIN(Color.GREEN),ROCKS(Color.LIGHTSKYBLUE);
final Color color;
diff --git a/src/test/java/model/FirefighterBoardTest.java b/src/test/java/model/FirefighterBoardTest.java
index 25cc8db..b06dd8d 100644
--- a/src/test/java/model/FirefighterBoardTest.java
+++ b/src/test/java/model/FirefighterBoardTest.java
@@ -10,17 +10,17 @@ import static org.assertj.core.api.Assertions.*;
public class FirefighterBoardTest {
@Test
void testColumnCount(){
- Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 1, 3);
+ Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 1, 3,10,5,3,3);
assertThat(board.columnCount()).isEqualTo(20);
}
@Test
void testRowCount(){
- Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 1, 3);
+ Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 1, 3,10,5,3,3);
assertThat(board.rowCount()).isEqualTo(10);
}
@Test
void testStepNumber(){
- Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 1, 3);
+ Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 1, 3,10,5,3,3);
for(int index = 0; index < 10; index++){
assertThat(board.stepNumber()).isEqualTo(index);
board.updateToNextGeneration();
@@ -29,7 +29,7 @@ public class FirefighterBoardTest {
}
@Test
void testGetState_afterSet(){
- Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 0, 0);
+ Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 0, 0,0,0,0,0);
Position position = new Position(1,2);
assertThat(board.getState(position)).isEmpty();
board.setState(List.of(ModelElement.FIRE), position);
diff --git a/src/test/java/view/FirefighterGridTest.java b/src/test/java/view/FirefighterGridTest.java
index 4b45ebd..68b6211 100644
--- a/src/test/java/view/FirefighterGridTest.java
+++ b/src/test/java/view/FirefighterGridTest.java
@@ -7,14 +7,14 @@ import static org.assertj.core.api.Assertions.assertThat;
public class FirefighterGridTest {
@Test
void testColumnCount(){
- Grid<ViewElement> grid = new FirefighterGrid();
- grid.setDimensions(20,10,10,10);
- assertThat(grid.columnCount()).isEqualTo(20);
+ FirefighterGrid grid = new FirefighterGrid();
+ grid.initialize(20,10,10,10,null);
+ assertThat(grid.getColumns()).isEqualTo(20);
}
@Test
void testRowCount(){
- Grid<ViewElement> grid = new FirefighterGrid();
- grid.setDimensions(20,10,10,10);
- assertThat(grid.rowCount()).isEqualTo(10);
+ FirefighterGrid grid = new FirefighterGrid();
+ grid.initialize(20,10,10,10,null);
+ assertThat(grid.getRows()).isEqualTo(10);
}
}
--
GitLab