From aecf9ee3b10ac117b0497aee330db5d2e824f305 Mon Sep 17 00:00:00 2001
From: BACHTARZI Imed eddine <imed-eddine.BACHTARZI@etu.uinv-amu.fr>
Date: Fri, 29 Nov 2024 17:06:58 +0100
Subject: [PATCH] Changed FFboardFiller so no two element are on the same
position in the start
---
.../executionHistory/executionHistory.bin | Bin 173726 -> 173726 bytes
.../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes
.gradle/8.10.2/fileHashes/fileHashes.bin | Bin 33497 -> 33497 bytes
.gradle/8.10.2/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes
.../8.10.2/fileHashes/resourceHashesCache.bin | Bin 63889 -> 64093 bytes
.../buildOutputCleanup.lock | Bin 17 -> 17 bytes
.../java/main/model/FFboardFiller.class | Bin 1878 -> 3068 bytes
build/classes/java/main/model/Road.class | Bin 692 -> 694 bytes
.../compileJava/previous-compilation-data.bin | Bin 24830 -> 24834 bytes
src/main/java/model/FFboardFiller.java | 7 +++++--
src/main/java/model/Road.java | 2 +-
11 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/.gradle/8.10.2/executionHistory/executionHistory.bin b/.gradle/8.10.2/executionHistory/executionHistory.bin
index 9883848b82cb70715ad86a3a6df5414a78ee0208..c46e15bd854f8e4e06bb1f69e356793676d553ff 100644
GIT binary patch
delta 350
zcmbPtmTTTwt_{`y><TiHvP`qHj1o;Va?Mi<%#-r+Gm0urQWH}Jq}DbcUo^?xAUfz>
z|HrqB*qWIzgf<)AmgL!fiHk9aQ{XGhx-*NMf9t!xXr5#-Bbs%)i3np5yMSAsZAgR0
zga>EVZB0KkRi$<NG-<}Q>;jwgSmV!Ko_N5nzWnN*X`!)`8>1(0f2PdH&&<-Xbmh_M
zKh+pLBp6@!HRpYN6TW7G*8y|+hSN)yt~|Qk=#TjJNOi_0MwagDZAYiy*I@i1etO2!
z-Dfw6TbAg~iawM6^HSgSwxipPwoQMh$*9IM6~vLyVk~A9IJ<C3`@2M+8He}YIBx9~
znmAeemn!QTkg1d9<Fu!L&}KZ#vH)c2K^;aZfd^0Dm2AuOZLEu{-7>{eAZl~<@AZrl
m*QdDO478iK%xyJ`+`sjgH=hS-H)=Z6zDbX9`zAf6H{}5PVWgk{
delta 350
zcmbPtmTTTwt_{`y?D8v&Gt5j)vZ}IDjnZ-|vrN+xO^b}mDl!rU_6a?Ae<0HJGl}o)
zI)(sUn>~yeLYob5OY&^L#KjoIDWK9G?X}bRlhkvI|2s~8Vtl;aM1(PjUEs$ye$D^0
zww>}1I_6Y)ZQrZy)1(>KvJ0f8-pDTsR1s*JdbBO_$rj_ujnR|0KT~GpXJ)y3d*PAk
zKh+pLBrKdu?7d2xniktv_nWSmdg<<zYe%*lUE|vxsm|EM$g&Tl@V*A)4{>(m;+3}@
z&W1#qiXMJ)>c+Lh-(MctZnS0kJ55G4mNOuZgcf5lqrjXsrScp1JPm2)nBryq>Ic_k
z?O&>_*Fo}=<>R!cf6!(;%W`hYwIkCH>M%+P7)SsAC?r*tr+Q{r=Jf;Ie>PYDUe72I
lD5_qmbcyl8Q%C#C=#a>eKOpT!{|>fq(qr7dNssAGIRN)#q7ncA
diff --git a/.gradle/8.10.2/executionHistory/executionHistory.lock b/.gradle/8.10.2/executionHistory/executionHistory.lock
index 35c1a18cb89651c04eb1af61bfe6b1ab13baa2d6..8f2e2b22a73cbbc959fa8af0ea18b150e32d3fe2 100644
GIT binary patch
literal 17
VcmZQRz2joLjYLr@0~jzJ0{}Lt1kwNi
literal 17
VcmZQRz2joLjYLr@0~j!E0RT3Z1i%0Q
diff --git a/.gradle/8.10.2/fileHashes/fileHashes.bin b/.gradle/8.10.2/fileHashes/fileHashes.bin
index 1d3da69423c8189fb22245a4f8d5717f3eb5fe2b..29469af9bfec929b3ec262caa5d5dd5f3c1f200c 100644
GIT binary patch
delta 246
zcmccF%5<}pX~R1&=7p=fCx7%xWL_1tW^$<aQRaoK7fhD*ky5xm#r<ZW-MnRPt6Aj!
zt-rjPfq`*y#j2q53}BGRG+8=KZF8;9V;1IBK^>cu1DgaC+-fTJZWGDW6TE!m`#!!3
zd9ap+^#x!Z42*@7S(988PS1F{`|Kuh%M#sL(Pz?sUV<oE-3L*`v~6={k{zSMVmsx!
zJH7^;j9FoB^BG^90IOQ%9|%#!@@De!WETm>*L}@-AK!$pnc#K6T)yEnL{ZR^$^7wB
Wn{88i<@gt_o(j>ydWwO8K@R|pwOW$^
delta 242
zcmccF%5<}pX~R1&=8oKblRtVTGS8~MJ~`C;DD%`Vzsa&bQVM~h>Xk~D7%x0^w6BZ~
zi40+2V4PertNITE7$p3gEFGq{xz^_~3v);A-Ob5?O#%vRlEG!m)h+Y2oIY%K-!ah*
ztfl?aY_JXn#=Oa_NiGuX#>FddJDd%PG!;Gk<kXF8U`4a44^Qqck=k6Hq{FD7Z){Z-
zX_&$F(Q@X3*PmGKf>pGCnh7z6C1mpPWETkw=MsCb(x#@x_SOBSE2droE1KFBJK3>9
WYO`%huN?oZ>N5}>tfv?l81w+6Lsz^2
diff --git a/.gradle/8.10.2/fileHashes/fileHashes.lock b/.gradle/8.10.2/fileHashes/fileHashes.lock
index 2682636e0144b8905cfc403e550010eb5ff1fa86..b687070073f9e85118e808cb30bf176a52616281 100644
GIT binary patch
literal 17
VcmZSHkQ$u3|HT_E1~3pP2LL&D1swnY
literal 17
VcmZSHkQ$u3|HT_E1~3q?1OPcX1m6Gv
diff --git a/.gradle/8.10.2/fileHashes/resourceHashesCache.bin b/.gradle/8.10.2/fileHashes/resourceHashesCache.bin
index 6815161183abdf4a645a1be4a7963eeea9022185..b472b2cc413fd0fd118ee8dac74ca66214808905 100644
GIT binary patch
delta 337
zcmbREnfdM)<_#tijK-TyC3bKNtpAwXT3^;7&Hx5KCr*B<Y{}oe(Ik1zO;@lG!_V)V
zMO7Z~2)u1*Uy;7XVje{Fm*nKP1{?W39c!2}3qL`{tS3)3Y~(L5o$lflavdV}bMt0i
zqh=<?o11$Ni7;-KHA`+|G~L{|XQm8)b^i3)42?Lbx~r1~Z$>f6a&A=Q5Z>JThJ|->
z>L-5w9qy%DHwf@Auvrne<l@$f$sY@a4fAY68Z;(6IJ0hR`k|>Rtqcqda>fh{43Z2C
z41ypm5Y=lJa_h--@5lEoBDvH2j!jl96%IGb`Xc6<l=Cj0d7s#ei9a!Q2`g${XPtU<
id7)uRMPI4fE=(0)S=OCd<osLT^+od}iy6_ZAQb>JBycnU
delta 73
zcmccng?Zv<<_#tijCz|*C3bL6W>qoV?5A>_XR@u~%E|u>D>nBTRWUIpZWcY%!?;=2
fEV+%*WOL)5nKF~#xd$@IeB7w0AiTNv4GS*-E-D<p
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 57797816a59ffdea6215d7aaaf651826dd514c83..5cee72757e140b9a4d5fc93caf5dfb26900fdc9f 100644
GIT binary patch
literal 17
VcmZSf?RGnPr1wxh0~oO90RT351mXYy
literal 17
VcmZSf?RGnPr1wxh0~oNo001^l1h@bI
diff --git a/build/classes/java/main/model/FFboardFiller.class b/build/classes/java/main/model/FFboardFiller.class
index bf81cf59688ca0e6ead59ff7efa1739a918ca915..11c72f5ec52221d0df0e243cf8394242f6bea792 100644
GIT binary patch
delta 1951
zcmcb{_eY%T)W2Q(7#JAr7<O;ul47doW{_tv<6$soFkxh1DbB1)<zirGu;gK|Vz6dp
zV9!gfDDliIVPs&@@YM7KskP-{uw$@iWMEEDEn#F3)$r8x$x19s)Xz!GOV{^L%1TWx
zv1Vs*WMtqiEy>K$56CahEXmBz<6_WYaOPofVQ^(+;Lgk|E=kNw&P*&xoxGmOg3X<W
z!Gpnb@>?b|Zf^!3b_QP_20sS>$$HG1_3R9Rj10oL`6;P6`p)@zd8rkyIjOm+c_rKo
z!VJMY3?U4mj11iAsU=Y1Vnzlb4XBgA4)Dn=F0tlj2xo|3XNcrsh+>FlWZ;FE2i3yJ
zz@DC35>i=^%E%z5q3HvW^aWYzS`V?znu{Tp!HAt9j*&qKSsEe>3YG*OhD3%WMh3Rx
zlA_eaTt)_I6jwk*^@G8Z)<O&n3@JPesSIh146KO-1v!<B4Du-I(@OJ_LBUq9?*?UA
zb2DTxWU@14@i1gF<S;UbgF_wcMHIss8JKeu3m6$JG$8Q;Rsk~(VH$D}q38$OlgGo5
z4+>be`jUK50D^p2$iq;?P|V1{S(KWaUzX~alf%d$iEN2;eojs**wxmWQJf5=3}x&L
z<va`(43&%w0$|sI(@1b-aY<?}BLj1ODJTI!T$!1#A5fH;R{{+n4u)z*21WxehOk<O
zI(CM79)<>nMn(o<uqmi&85!6MKss~sK&cU88pNKGqRhN>Yt1l_<C}RHS{Pax8Q36>
zpS+q`iX)t%orj@=p>uKxv(n~k%x;V<GuasyPF7%*uoB8i%uPy3R7uOs$#Ke0EJ{%^
zU}R9xfF=!Sy0O;u0S7KDiCZ%=Fjh=9V^ykWWDs!5&o3!1DM~ExO)bgDPbubSV_3<>
zu!><dJHr|thP4dq7#Wnnz5%;6Gp{T^J5}EYY^!f-Nn%=Ja!GzsB_jiOE;8>7G`x{D
zK`ih{%uC5hEmrZ#&(E$eEwIK62qY1xbr7APgpaJ8cu9zzn0o8=kxYgrG-MY$C+6e?
zXO^T|3ovY8WKcu)6SM$9)&v#eXJgpJ#lX$5nTKH!!(su3#f%I*o_TqxMb0^i#l@+`
z><rr(8C1bRT90fQ#3>M`LV~BXfSq9{BZC}REl#D33~ZpVEG=MAWZ-6CVqjokWME+6
zW8i0CU|?ooWME}rV_;<H0+*y9J_Cb*)^-L)t=$alle<`X&AS;G7`VXtco|q2_!xQ^
z7#MiKW(Y9!GW3DX>t~n%F@tdz0}BHe0|UdA$>&%#>(@xKh_V@3u}iXVV$fa6FkMHI
zeH(+J-aLk0U9Bw)T)I0MOc@!rF<9(muwi02z~ErTDao!a$+?Ze$%;c;l4B=>8xzAe
z2Ctd_FH3S9WC)naV5h6SlOc$a0VEd&(i#KRD!-E<o{?b}Lox%yPKI<QhMf$#j12WV
z848#f!Z$IL2vu!ksL_?=+{w_y#1IZ~MvNXyivRNe`7LaW%l`*&WME)mVE}p74jeQB
z3}Os|42BFs43-SS49*PV4ABe{45<u~48;sm4Al(M4C@$V7`8FUGVEuNV>rbi&v2GO
zkl`|eA~=9N7}yz78R}CRCNfN7;9!Vm$Y+?$Fol7W!H{7N!&C+X26j*wLBo%M;R?ev
zhUwriy}~eqVI~6;gBZg;hFJ`=8JHR7K*Jj%GM9mwVIBhmg8>8Ee+Fd+c6J7Cb_QW~
zhWYFa^6U%?7#SHD{xFELGiY%BWhg3VX9#C!aQML>_Je^{fD4q~AkoBN$iN7;j$Laf
zLmMN*1_lNOCa~v0X@P-38te&3EVDB#VVDF?D@(zumN6`cx@ZLhGsAj@jSO2Dwt~|L
MC_Z*D>|&4v0RM{qA^-pY
delta 725
zcmew(evOao)W2Q(7#JAr7%De%Nio&4Gng?l@RpWj=I96H7iX4a=I3!U2s2plFjz8}
zFfwqbr<MfempkW|=9O?UurpZmFxW8IGBU8|rB;-9=9MrquxNN{dV;jr^DsDowD6^;
zmN@6<l;-9^b(u0a@i4G5I5RS^YIu5ThH)`yFu3wCxG}ghGEAP%<ih63!{Ei>J^3M%
z8MiNkA3K9T4?_S$;AACcO<8V+V1^KOhEN`cFotkO2HxEKl++x3*PPVc)Vz|(`&pGl
zxf$dcB6%317@`>&IFj@8N)j{kiYL!yl@gR^h~;631BtU0rRL_BrEY%6>c%LQ$Iej3
z$RHf;Q<j-pt{;|}S`IbNdU7qhk{p8~12+Q`0|Nsi0|Nse13v=;0}}%y11kd?10zHH
z<aSO)^8^M41}?A~UIrEhK88dF1_mCmdI5$chGekb6oyogdIko@HU?G(E(QjMHIwgi
zYSy<%vWT)7S+Ps9Z(`70%8;)k$-a%jP;VYX>TU+pNUbdlT-rMs%o!QBF<3!4c3{qS
z21hGSNp@{X&TR}XRvg-r96K32m>9M(_{?Gu)&=o`7#VglL@+VT`oBY0l5;0R3==~*
z#Pk?FmK6Wx|EIUGF$ygIU%iomfq{hq<Ow4Np2_>UMC;QSBp3=9BpLb`q!^|%NHZ*A
zkYQNLAjq(qK@RLW4+eII0tO?7G=_8r4u&)a8-@&qOa@K{LxvKDECvGxc98d=UT0uf
z!;sC80}hTg47m(>3``7S4AU6$844Jf849661raG?U}h+0V6b5@U|{>tpv=I|&cMyi
xAk5BC!p<Pi&QQw8$iVQ2L6n_AgYz$g7dt~RJA>&D2C*LutPG3{<=~j9005w;jK}~0
diff --git a/build/classes/java/main/model/Road.class b/build/classes/java/main/model/Road.class
index daf2775c54136c16ab148cd29c35c05003a30797..2e08aedd4f1bc69add1182c39883ce9eeed2d03e 100644
GIT binary patch
delta 153
zcmdnOx{Y<hVlGYwJ_cbP1`!6)iC0ur#Tgj{bMsSDbM%Aq6I0w0lS}f8D!CZM7$kWZ
zSQ(@k8JIOR!zO-z#Vo=gI{67>hQA&IBLgD?0|Uz@2B8fM3=B*R3JeSkY+x}y21N!2
x1|Be*g+YlynSp_UgF%Bqih+?qo`HcunSqG`1h{uIh(&H^kl4&1G<hbIGyud*7+L@T
delta 129
zcmdnSx`lPZVncQYVMYeQ-29Z(9Q~mD#1yy0<dXcNN-hQ=22macRt7Of24)S-Fir+O
z1_>SpNd~EjYgH%ye8DWqAT{|3V+NNF10w??0|NsS<Kze?8FeNGB?e^%1_llW4F)j=
fMh1BX1_osYCI%4T-pwEsxt&2|GlTf#*-X*^&es=B
diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin
index 8b085a4b3b6c24c3e04d4010f27f51cd399e4834..bcdd475d8fa9ab9d476b27463bf53c14f1b7aa66 100644
GIT binary patch
delta 80
zcmex&kg@3y<A#5%0*tTwn)5!s312h8>wvj@!|BO<Y?}p6&v?4~>?U!`65UzRXVQOO
n+I*4i1hW`pHzVUrMh1OGZiQ8hGa0ouF=~5tGj3kZ6&wZt@B$%0
delta 76
zcmZoV#Q5(Z<A#5%0v66C_Fkn;O^fZT`%PC&y)>DRZL<Koaq-IA4rfCmO+^nsId$XO
i=8J46n1vV^XEHMAGjb`cVw}mSwTV&NYx8=p;4lE%l^w7E
diff --git a/src/main/java/model/FFboardFiller.java b/src/main/java/model/FFboardFiller.java
index d89b9e5..6669df0 100644
--- a/src/main/java/model/FFboardFiller.java
+++ b/src/main/java/model/FFboardFiller.java
@@ -20,9 +20,12 @@ public class FFboardFiller {
Element element;
Position p;
do {
- p=new Position(random.nextInt(boardData.getRowCount()), random.nextInt(boardData.getColumnCount()));
+ p=positions.get(random.nextInt(positions.size()));
element= ve.instanciate(boardData,p);
- }while (!boardData.addElement(element) && positions.contains(element.getPosition()));
+ }while (!boardData.addElement(element));
+ if (element instanceof ConnexElement) {
+ positions.removeAll(boardData.getElements().get(element.getType().ordinal()).stream().map(x ->x.getPosition()).toList());
+ System.out.println("0");}
positions.remove(p);
counter[ve.ordinal()]--;
}
diff --git a/src/main/java/model/Road.java b/src/main/java/model/Road.java
index d32acff..a769a7f 100644
--- a/src/main/java/model/Road.java
+++ b/src/main/java/model/Road.java
@@ -11,6 +11,6 @@ public class Road extends Land implements Element,ConnexElement {
@Override
public ElementFactory getFactory() {
- return null;
+ return factory;
}
}
--
GitLab