From b67c89a9b43679d907eb9f09b34aa638c84fa49a Mon Sep 17 00:00:00 2001
From: m19023837 <chadi.mansour@etu.univ-amu.fr>
Date: Thu, 28 Nov 2024 14:39:30 +0100
Subject: [PATCH] Rapport updated
---
.../executionHistory/executionHistory.bin | Bin 124550 -> 124550 bytes
.../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes
.gradle/8.10.2/fileHashes/fileHashes.bin | Bin 25997 -> 25997 bytes
.gradle/8.10.2/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes
.../8.10.2/fileHashes/resourceHashesCache.bin | Bin 25773 -> 25875 bytes
.../buildOutputCleanup.lock | Bin 17 -> 17 bytes
.gradle/buildOutputCleanup/outputFiles.bin | Bin 19469 -> 19667 bytes
Project Repports/Rapport3.md | 6 +++++-
.../java/main/app/SimulatorApplication.class | Bin 3261 -> 3256 bytes
.../test/model/FirefighterBoardTest.class | Bin 2167 -> 2190 bytes
.../compileJava/previous-compilation-data.bin | Bin 21348 -> 21348 bytes
src/main/java/app/SimulatorApplication.java | 6 +++---
12 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/.gradle/8.10.2/executionHistory/executionHistory.bin b/.gradle/8.10.2/executionHistory/executionHistory.bin
index 73f5c656ffc9d5907e18817f756a67622bb73984..de88797ecfb00d63e0278b21dff55b0bc3065b2a 100644
GIT binary patch
delta 270
zcmZoW%ieaDeS>qCT}4`MQCeoAacNP8SwTTsYDtB;u~~VBiFu(wD)VtMGlrN8^IUf4
z@po<eeVY+OXmexNZXThutDhI`%JwaIv8;e2?AI!O#(C2XWf&zlr%z|(5!iHnZ;pGB
z^U}k28V&@OXndc3-kPy~vVkwl<ll>x#WyIeu&a4uRM5PRZRO0S1*?|bxIcZn(T>Tc
zOEjd{gW21dnHdDug>bO{SSoN}-L(45)f?VhZLU~ygNb>^jr*H}mrF1Tn7hss@b}*|
zN#Mt!qPxFx0w-Tg(VVVh%UC+OCe?g%z)E38;aP7!uUNG-p+Re5%}K?ZTZ*sWxZhm1
LYJ1r#MgbcDqX2s!
delta 247
zcmZoW%ieaDeS>q?^mihR(#myjoDS({e0(;Uvw5ZQ&Zi~^nFP><HaB+d<`GIb@Vs%3
z<RhP5T`_;+=7iWW&YNy1!zj5qeL5o#fBPx-vzr4H{;dA+KTC@5@APxlj17|wd|4*{
zUaTx$Y9+T#+2+H>yCILab-vTM+S+?<+IFM8lTDXsNcVu*+nAXd1Z3aUs_iPCvDTg|
z^wM9|w9?HLOKvbRAANdqbMSHrMgeQBhUmXqCH~vwXT@9z`m$#7#T3oyI<}0ZlWS7V
oHwUZ~W)wE~Rd;DlWbb0vH%3z8-61B8&rUX%t=e9;ic!D@06F<`Jpcdz
diff --git a/.gradle/8.10.2/executionHistory/executionHistory.lock b/.gradle/8.10.2/executionHistory/executionHistory.lock
index 01305c5a79fb3335d4212cb69cec6ecfe9799a7e..be4b1455f2e26392a0d1d8fa4afbebe2d6608040 100644
GIT binary patch
literal 17
UcmZRsO8#f>m)m%p0Sp*r05e7eJ^%m!
literal 17
UcmZRsO8#f>m)m%p0Sp+00W&=WH2?qr
diff --git a/.gradle/8.10.2/fileHashes/fileHashes.bin b/.gradle/8.10.2/fileHashes/fileHashes.bin
index 5f6ff7684485ab0401d5d71fd8517f8b3ed6fd2f..c319817476f1128e58812f6729d1ad786fc58b87 100644
GIT binary patch
delta 140
zcmeA@&DeXIaYKBVL`SXA6??a<L1~kdTJ9|goXEhyIJxNi^TV6V!<bkUHYlyIt9fEn
z(7cXq<;<o9t01y()EK~kXUF6~Up1DZ?{D-cSNrO1{uuS1iTV2*i^;PCq!ebo`MhG)
h(u4-Bg*7J?Z*D1uY7GbLWC%`~+!&{}**VUO9RPWoItu^*
delta 140
zcmeA@&DeXIaYKBVgldjL^xTPtH+1>CR~&p}`GtXjadOesrufa}VN5IvrB-s=lx;q2
zyc_a(Tjx8Cs}R|?Rt7NO**iJVSB<6UYFp3bYG1w0AEVwgF@GvLI(c@0l!C#px=V8+
idl$RDF_IGR4lx01{Zz~d*2xf@GPyBMZL@Qn7drsImo`KI
diff --git a/.gradle/8.10.2/fileHashes/fileHashes.lock b/.gradle/8.10.2/fileHashes/fileHashes.lock
index 1f3117a7e6e764418451701a2f7793e3994ef72a..88397e779c97d34a4446689de696c65fdf4aaaa6 100644
GIT binary patch
literal 17
VcmZRUE=)E0=%H|g0Ss8*001Z<1T_Ev
literal 17
VcmZRUE=)E0=%H|g0Ss8r0RSii1Q!4R
diff --git a/.gradle/8.10.2/fileHashes/resourceHashesCache.bin b/.gradle/8.10.2/fileHashes/resourceHashesCache.bin
index c7f8aba72b9fe6b90a63279949156eef2887337b..8485cbb0fa1b506f23804d4b7be5def49ba12ab6 100644
GIT binary patch
delta 197
zcmZ2`l5z4W#tkMCj5jBnN*oaAnDdf1Xtq-h0~n;7pZr$hgusNy(+n0F$_awS7*f`5
zUMsnio!@O;ki^$>%}~LQn`0F}b1`OaRQw^n(O?7fW=D@4nKWYt1_nt61_qE;L4o>h
zzeST*iY|QOa8xz?WmPN#1A`o@ivP-WFP^s?@2%u#`|v`tc0Z<yw5y*N?aKBoc(JU2
LBkb2Ievk?P&uKk7
delta 44
zcmbPyigE2p#tkMCjMpZcN*tKXD|uk^Q^}3&o7XA6;$l?XsQ5#Cqrng6&5j;9G61I1
B5<~z1
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 95ccd3a0ea82d0ce1f4b91f7c0c51ec34b2256aa..e54cfa606ab2e35f7282723cf904ad6fe677c464 100644
GIT binary patch
literal 17
VcmZR+;bwJ3Kx+R{1~6da0RS)`1MC0*
literal 17
VcmZR+;bwJ3Kx+R{1~6d!001!o1kV5f
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
index 5255978d1ddb4dd589fea8326d1aeb547bbb620c..1d6bd7f9b379124754ac0373b7e217eec9eb7551 100644
GIT binary patch
delta 291
zcmeC3!FYKl;|3E6M#ssf5)}@!f(&-7I$o{M00ut1|Dj;+_F%^iPu(|yg&BMdp~C+c
ztmIl^UUPvFD!zX6Qi%>mfv0R=t!FAvdI=SEo~$aRAn^K+1AFz2nE6n_?#Z@N0RrEB
z-w8UGteguKtlZoxCBP_P{4r1e=_|%asOZ7Tz0wK-j>)^M3SWp%hYHG1UMj61;N`c_
zV9NEve5hdP<h{}g0zMN{GA`Oa{sk4BJNc@#f<TzI;hzK<ewg*?o8L+&F*31fZdCjs
jzR}==;ATgUGt86sd+<(P;AJ*hz{_KDf``!L4<4ET*_C9H
delta 70
zcmcaSld*RO;|3E6MzhJL5*3@jN;EJ|?v;|5yjRL&v#c}+<78VIiOIP#5|ii3NK8H}
cBeD6fOcWy%tKvq*AL1Jgeh6)L^f<!|0BI^1t^fc4
diff --git a/Project Repports/Rapport3.md b/Project Repports/Rapport3.md
index b46572a..4fde4d2 100644
--- a/Project Repports/Rapport3.md
+++ b/Project Repports/Rapport3.md
@@ -10,4 +10,8 @@ Avant la prochaine seance nous allons corriger le code en sorte que ça fonction
refactorisation totale du code
j'ai enlever les classes Manager et je les ai implementer dans les startegy de plus
j'ai ajouter une interface globale nomme Strategy et une classe Initializer
-afin de reduire le code dans les autre classe et faciliter l'implementation de codes additionelle
\ No newline at end of file
+afin de reduire le code dans les autre classe et faciliter l'implementation de codes additionelle
+
+Rami à ajouter les Roads et les firetrucks dans le code et il c'est assurer de leurs bon fonctionnement
+Chadi a ajouter la trategy des nuages ainsi que les montagnes et les rocks
+nous somme entrain de verifier que tout fonctionne comme il le faut
\ No newline at end of file
diff --git a/build/classes/java/main/app/SimulatorApplication.class b/build/classes/java/main/app/SimulatorApplication.class
index b735608fdbebd05cb7e9eb1ca39511b3fbfe80a5..92a2b722540ae8ae1d5c93881b90cfc08d162c5a 100644
GIT binary patch
delta 650
zcmdlhxkHlc)W2Q(7#J9w7?y415@i)-WDxT7^9=EH^obAhcXWw&_7C+7nQX@@#>&jV
zz`#5?gmpS&!{#@vsf@N$7#YMhe6kYD64NU5Q_E8GO7vYpq_t)kKO4g|E(Q*U={yWQ
z47~yjz5Hwpv$z;$Gt6OUn9IX3k754iK6YV7mPL#Vs*^8p$Z@Io<mYFX7O*ocnS7RG
zvtS{EBttPn76T(gIs*d(6GQgoMoz=Yhd8C|Di|0T^cff#7#SECShcn@Fm41ZsAOPZ
zU;_*CGE^}zFz|rctPIr*HDGx)26YBThKk8jT-J=0lf$^=RY9u67?>Cs7_^|OKrC*s
zPDX}W26YA|hKk9vxa8eIW(zT}FfcG^Ft9RcGH^0zG4L{IgYAKszy~*hj{#yr9RmXc
z3j-rVJp&Vi76Ti|tV!H<0vrM&Y#bch7<{0vp6ti1><n^=7TA0ns5u-ACJc=XO$>|-
z0t`9~%?vFJObi+fA`GnzZ4Ar|$Y$$;eO)nm3%9N<!kv~3JPcM0A`I3H(hN38?v#O=
z&%+?V(9Y1oz{tSK(8&-F4jDNfF>R0uT;MRVXJBD)0PBQ>WEVp>1A_n;C_cgJ<9S3q
zLFyr)u85?Tg`tn3ACy=aCV<0!BEuwTjLc+UW|+({m0<?M0tN;KE(S)1g$#=smNG~J
E0MVLcaR2}S
delta 637
zcmdlXxmS|w)W2Q(7#J9w7?yA35@ls&W?*1onJmvLDh*<BF)|2y`gw+UI{L&r`}l{t
z#5?<k`h`sPXPwU2xcND2DkJ06$-eBe^3%B(I2dN|F!VC?2{82WvoXx(Vwl4)mz`lA
z55s(h1)DqBg&A2EGcu@7KFF@h#?G*mkwI?qL3X*xFF7VL7EkWsG-Q@!sF=KgQ{AqT
zfq_Avfsuicfq{WlYdZtuMg|53CWa~o1_m~;ATL8T0|NsOn9a&i!%z#BS7T6TU}UJA
zEXrlgST#A2OI{VEN{oStfq_8_stUy72J2*GsAEuPU}C78Je5n{9b~o;0}BHKg9ZaD
zgC+wfgBAlXgErV6hzWdf6ZjY)Ce(uhih+@#fq{uZi-8Sn)^9F50d@f{4i1iO3_eh2
zPxj<ib_O{`3v7W6)F2K96NV;+W(GzE0R|n07KT;^CI$@#5r#H~b_Qk!WW#mA-maXy
zo?Dl(YVuuf@p_PH5NF9iP2*t@VCZ1zWME|AWawgu2L%KJ1A{R<6n8MhK%K+Dz`z9#
z6MF_01_!VYVIkSg(8ItWzy*p!r~!Hm4B${^*};&2(C-R~21O*zEDZe&6Brm6m>DL5
jBV!W7WM~x4Vqj*N!Z3|tCc{Fo)r<^_7?v<BV~_*@DVtuf
diff --git a/build/classes/java/test/model/FirefighterBoardTest.class b/build/classes/java/test/model/FirefighterBoardTest.class
index a0d71f0e7a0e444e0331454984cd677da7957fb9..6a1beb64df8a67fa29677182891acb75b0afbaa3 100644
GIT binary patch
delta 404
zcmew^&?h({k&Ro!)6>&)V{$sHcp(E90}}%SgYs?$_DBH{0WKCc0WJ=<$#+=QbcGrC
z7?c?J83Gs>7{nl|7y=oB7#J9Y83Y(Y7(y8s8NwJC7<d>M8H6Y6vnk><Er|_enlOVB
zg9y>4iBCSm#wC7$fs28efq}sd&3!M}JfnmeBp9R_BpEarq!<hsBpA#XWEfl-WWhEl
zFfcQSGAJ^{FvNmg?gn?cF}lkcKqBD`j0|yLzcBq}5S`r3t{}P-YIP{gYG!6;=E-~5
zqg;g;6d7a~lo)gvlo>1;R2V`SRN<B~FoZ&_5@K+MS|!6^$&kR1$iM^-E+Gcz$%bsg
Ilk+$@0hfj^>Hq)$
delta 371
zcmeAZ{4Ovdk%?VnV|qHPP!0nd0}}%SgWPTg_DBH{0WOxwPg&J;`55>ZWEuDw0vH$=
z#2^Y70vUoB7#R2%1Q<dXLKzqt!WbABco-NN_$FJhDPl9IfDL4jFoP_E2$2RIW>XZ}
z&A`UM%)r3lh;Y$wHqR(N1_=f+21y1L1}O$@1_=g31{nqi23fGd3JlB)0t|`_F$}R_
zw>rYzYK-ny29QWN10zEm*!4_*83ZQJV^<K|3bi#5X6xk3>`~5q42ldA3`z_d49X0q
j3@Qu(461Mo85jcL);L40kzlZ7NMJ~0U_uI<0uDI<Ox`Qk
diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin
index 88b9efe038e7d5399b7fc58d68ad25fd6a38d9f4..d38261c5ea666b69194f24f866e82c0568dfcdd1 100644
GIT binary patch
delta 61
zcmaE|jPc1b#tmDU1U4wGu&a4uRM5PRZRO0S1*<k6Wr|~#Sk>uqe(CisrrIyRC8mr2
Uxw9-`#jIap0+%;ivuXMQ0Gi+()c^nh
delta 61
zcmaE|jPc1b#tmDU1WK*swkg|u*myVO@wU!)8do<TWr|~#(0=(XdFk~nCh6jT?kr1K
UG3!^Dz~xn)9ve1WvuXMQ0Jb|Gc>n+a
diff --git a/src/main/java/app/SimulatorApplication.java b/src/main/java/app/SimulatorApplication.java
index acce2f1..c3f4ee6 100644
--- a/src/main/java/app/SimulatorApplication.java
+++ b/src/main/java/app/SimulatorApplication.java
@@ -18,9 +18,9 @@ public class SimulatorApplication extends javafx.application.Application {
private static final int BOX_WIDTH = 30;
private static final int BOX_HEIGHT = 30;
public static final int INITIAL_FIRE_COUNT = 5;
- public static final int INITIAL_FIREFIGHTER_COUNT = 4;
- public static final int INITIAL_ROAD_COUNT = 10;
- public static final int INITIAL_CLOUD_COUNT = 5;
+ public static final int INITIAL_FIREFIGHTER_COUNT = 5;
+ public static final int INITIAL_ROAD_COUNT = 20;
+ public static final int INITIAL_CLOUD_COUNT = 3;
public static final int INITIAL_MOUTAIN_COUNT = 5;
public static final int INITIAL_ROCKS_COUNT = 5;
--
GitLab