From d1e5c605a25b84366e26ffd53d062d3d0dcdfa72 Mon Sep 17 00:00:00 2001 From: pablo rodriguez <58742538+1-pablo-rodriguez@users.noreply.github.com> Date: Sat, 10 Dec 2022 16:12:36 +0100 Subject: [PATCH] =?UTF-8?q?MAJ=20V4.3.2=20m=C3=A9thode=20placement=20ajout?= =?UTF-8?q?=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/.gitignore | 5 +- bin/allContentChild.svg | 213 +++++++++++++++++++++++++ bin/allcontentchilds.png | Bin 0 -> 1823 bytes bin/allcontentchildsmini.png | Bin 0 -> 915 bytes bin/evaluer/evaluationAttribut.class | Bin 14308 -> 15398 bytes bin/resources/allcontentchilds.png | Bin 0 -> 1823 bytes bin/resources/allcontentchildsmini.png | Bin 0 -> 915 bytes icons/allContentChild.svg | 213 +++++++++++++++++++++++++ icons/allcontentchilds.png | Bin 0 -> 1823 bytes icons/allcontentchildsmini.png | Bin 0 -> 915 bytes src/evaluer/evaluationAttribut.java | 71 ++++++++- 11 files changed, 495 insertions(+), 7 deletions(-) create mode 100644 bin/allContentChild.svg create mode 100644 bin/allcontentchilds.png create mode 100644 bin/allcontentchildsmini.png create mode 100644 bin/resources/allcontentchilds.png create mode 100644 bin/resources/allcontentchildsmini.png create mode 100644 icons/allContentChild.svg create mode 100644 icons/allcontentchilds.png create mode 100644 icons/allcontentchildsmini.png diff --git a/bin/.gitignore b/bin/.gitignore index 1f05cf0..6f5d98a 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,6 +1,3 @@ -/MEPTL/ -/calcul/ -/evaluer/ /fenetres/ /list/ -/resources/ +/evaluer/ diff --git a/bin/allContentChild.svg b/bin/allContentChild.svg new file mode 100644 index 0000000..7e3089a --- /dev/null +++ b/bin/allContentChild.svg @@ -0,0 +1,213 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + TXT + + + + + TXT + + + + TXT + + + + TXT + + + + + + + + + diff --git a/bin/allcontentchilds.png b/bin/allcontentchilds.png new file mode 100644 index 0000000000000000000000000000000000000000..2154d94d2bdf85a9bd082cbe754a6afc14c4e8b0 GIT binary patch literal 1823 zcmV+)2jKXLP)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H12CPX$ zK~z|U)!BQn)m0S-@XtDz3y2SVWSNPYjHZ%~&q2nl#9n4Psp;4_lU5EsN}~sZsc<-; zr8rGKMheZwsiqP~MeX6Fsgsp4f%q;VpCBj-ipZOLR)73{Hx6*mz30M}vG2^DbI#s- z?e+bwv-VzVuU}*)5OF*Xz;v09P$; z_DrVM>1ZVX9P_?YkUbo`V-=o8;Ji})d)OAE%JvdE8h-Ej?vP&Z^9Lr=>KpodCif+W z;Kows_;QW6FnFW2XJK6vy*-kyH1V0e^{gBy-~3bU55$I!xxQ*jWcWaiRd z>*)r)CtczW7LCNOxd4xLuD27%KTAwy$Ont__PV|x+KA02-H9`qfg^A_=0Y2lQTPx2 zmoZkvj$5jy5nD_eog3pe4EqO{FDSbQ5!*2u&xsf-Vw=8D*Egg)k-2sR`|gWbOj%03 z9N8IHVvdMW?ZwHm+2~W!5it~}uHesyXMW>AuDBR$3g3o3Fm(A+Y; zme%{*$4S!utxPIU1nKwWj5q5O)cGsi1-i&^vZnWJYcC`xz5jfBX%Nh-_04g z3?FD1T7V;EF6dhyZTzPun5*X7Tj1~8CYL2|l@{+v4%xgcZ)+iQxy;Kk6lYQRpXh3!Crhuz3{iyTK0^vLOILSS+&Ak@ z#(N~a4zK3;ylwN?^&U}+LlmUfG@H}YMqH~Xq-;G@{->`g>FzBZ9+7tKOHMta&CAkx z23p)~N=w1zy@q}ewHSo`Ra(4J)V-e7qN*9SI9M27ZmynD@y{HWv*Y?0V2Lpp(jwOs zexKv>o-kFrg=Q%Vfb&`q9$dB)w0TK~Cri0m-HU-k6_uvLgilD<;s#-U3zWZr;o1%9 zXQ81uNcen?&p-Ag8?_i%5Y*xGLDjl z;(m;gJ_ah53U3={j){&?x4q)9Sft%8)_T=id-X$qFvwq`7PsISMOEluiqh-Vik5Aikq=gm?+G~Ns8Eiv!aN2wN+N?>fo>VG-hgZ z9%g#Rx%fN2ikanFn;8%yIcRmgQwRSGW_CR7}rm{u|4(+C_1^YfM+9rVlln&@{MYHJ?YD zaDR)+8idWpVD*+Z=f-#gOPU#nZb-)!u@?ra8{TWR;j?&2IJVcaMS`|4CdII36Pkzd z4yWJ}e6iPR)5*9{I;}TiabvV&FI=PET(&vs;#{1Dj9Tp8vf?684bE!*0f$B{`gb=S z^s^k#dd+^qt+sWaqLfz0?2U!i=N|30#|rJvEJwbQm*(5?!#KklD=|j#vWwz1%$q_= zyF@MeWi{7jHAj}?$3a%}(DL`l@_{ONzmz4R1ELm{tmZuHOTtf=pBI&%-v<*M1nN4% z1iRrCOc#FJja53an=~0$;ZOJ*?h+p9Q8FE=c9)sb$xb9?5FX|G&)g{tLc|Ap-29F?Rp} N002ovPDHLkV1k#1f_wk~ literal 0 HcmV?d00001 diff --git a/bin/allcontentchildsmini.png b/bin/allcontentchildsmini.png new file mode 100644 index 0000000000000000000000000000000000000000..35c4f8585c4e0a1535c1dc97f7390df8f6faacc9 GIT binary patch literal 915 zcmV;E18n?>P)ZmNr-n;;!s1cBWI{kt)vWLrT5 zMGzF>NXWtpiYQZW+AczJda;NIMYKTYiZopsW1hLQr;GP>JLhaCHTuF2-rw{5p6~Pg zo^r4K#i@Z|~GQ(Z>a6IS@;t=Ka z*)0a}0iMA+{D5s3!6I96OD}A$hU9N zH^u`vxQ`9(%)5kbof>5ONAXeqyjPZ<74!MyZ?=>e9b+tbBUtD%iu?`EVnL<6?xH0p z9}P~w&B57BsA$ua6N8k}Q?j8ufdhFoQ<$Y-uA*V*E5&P>^9r{=M(Z%=TiA^EMT}KB z$epZ`4bpVnYn3(b)?@oj>MbnprX%qP4&m0u8ESGAM`t2Pucgx_v_(Yki~(f$L`rw! zCX}jE)SVWhr>W=2xX(^U_RlB+A{f6759Nm?Xjp;Sei;T(!WQJTzmn$(9O$;sTw zko;Sdbm_tw4Zg3rODmqnpyXE^uZebss{i7 literal 0 HcmV?d00001 diff --git a/bin/evaluer/evaluationAttribut.class b/bin/evaluer/evaluationAttribut.class index d7257f38a7dba8dd6f53c9160c4d7d4079f1a817..0608d895bae57f59cd75f302ca5d6b64be423272 100644 GIT binary patch delta 5728 zcmb`L33L=?w#Wbfs_LprrxQpz0UAsQ0SVa%Yk;tXEkrOtAb@~uO=vxm$j`!;Y1`e*2NB(LKyz~g36lU zN+;v!HW*JNhCP=A>-<$^CH_i(z+2}Ju5>YhiG;Jht%OMHV~vTrGBjS#|Dxv6_naeZ zO?rr^wm6&;SvME2z)Fe8PESKymC0lo%o_-dtF8)4zD%YN+R0V>`w{bz%v@`IOj`G$%riKQh%5Il_vQq=Rb@F7g|5t3 z=i+dVu-=Tx?KYI7T+HVH!t_@KXGu)HD30McgJZ28v5D$<7Ffe#Q?x>&v-M_N=OmL8 zWn#t)eM-QWVozv_lM{Hg3l0_uQCD*Ur?@zk#n$fF;hb)L6+1pOLqw5kH=E_+HE0lL z!RpA2I5~&c8k|eG!<7E&oMM@&pw#-jl`hU>kpx_07X_-ET)M51=FqzW7>a%k%$+N}y&A9lPhezho|%3JBP zxz@UP3)fjo$txxfm z2K~!LWe-_rVG(Y(irl^Uv{ma)6JNn=t((yVn@SgNJfgJo^dVYic_znZ;!a(-GV5TFN z12KfT7|O92#sKnIi{V@)``*16$;U8?J3`3kE{x`L7{hAqmXShaLi`mMZQrCz@$^-B!&tS2#2c^nOSfYG@ zrOFAEDW74P@+JJrS(K~2P@$$HpbkZ)dd(D6tMgE!E=8^CN1a-UdUZ7#)QwoK-iKxC z7TlGsAvHdCX&Q?M2+2J=F6|PgJ`%sdLk4VpN{f6V+lxdz?*-X+*3iI{aT>V=!E_ z8CQghHY35~^h7taV**2+Ha!TtMWUfSgw(8z%*ZGO(#)=tx1u16m#gj_ zhBmV3F)lfX$ML+(EH?kI$M)c6C`o)Ar9bj!zlcM@-ppBUcF)tlSMFwyCJbmq*B_R~ z=Qd&Jj~e$3H}3X>#y#D<@*k~3Z1L%4+C`hExtShr?$JHE_+h5D$fGwgr-=je3@z7G zbE7;)Glw*Br1mhTYPnHcF)`2iEJyFO0WHR5eINgc7PK&gwr^T3wW6cILaZf{-UhLe=Fc{M^ zo??pnIeVyoW2$@yxOsmMUHzo*|9yu z>5fAzalFJCj?PK0vzsef@IBWIKu|@xy*BhO9gVBvQ8dou7EaxiYG2U!E&(+30 zt}#Lfxz2clw;FHrHZzLr%>-^RJM#{+2k$iVd6zkk8_iE<5K9_}wGfM-hAppHnp{^GV=+o)!|kHKBLZFo9iyy$Y5Ac5D`AM* zHn2)8Q#7}Z)lwfN%3IAEv7Dm6>*R1MMYJd|nsrj<63w+*tFa*5*ARWp4fi!gWwXM4 zqeN?y!+o71v`CL=wKMKu*st0()aqDGZgs4twmMcbTOF%;t?tyCHtVBS$8z4ZI95-! zI#xe#b*yQvj`c+BV!a)(-VIMODCr8BdJk-2gP2izAwpbkN32hiyW!8oiq?-Ki7TYm zkZGL4l~Se~&toUA6U#96;c5Py*TXapVmogTE6R8q<9Q=PaGLqZkON)DGsmGfZ?eZT z7s^&sCgZtKF4H$?giJ|faw_D$6iIXiqFd5d0cT4Nq^u<(DMJ9@%NV|UMfwPKO}v2q zG!Q3$G3U|SK(hR$^!g6T7Bf82XOVgi*Gf@#wskP0r?%i*6j*=A7`y0Zd*ijY&aB9e zY46{Yvm?8vM{C9iIggQ_ExUI!*Vrd)R%Fk? zr$^hvO;$~I(!|H1a;pez8?yNX`f zqJ|Ph!F)x%EKA`GTitSn+7h`mwUdpTTQ8#XAM56ci_X;*lax59N<0k3jUh?`@{~l3 zQ98-(x(mt`PdiBm+9VxllXO7DACXc(q;#-f;dGnxMzsky$<^*BP(F1j$~2+uBb4bF ztYl!Ql8JmJ3k#IKa@WskM_JxRS>8rj-bPt&3%-A0NjRJFM}BfLcU%f{gkX*o%u&cy z@-a*qjnT>&EL6tH=g9bWn32Ox79%R!Fe|vTC7BgA=73hr<3Aa5*QGG03FdUcED_8Z zf;m$#X9?zP!JP9?F?YAe99UTLYg?QDk8Czw3UirY`USIGFe?NzAefbcSuL1yZc6qd zyY0oZ+1ws;(9Cg{KN)_!VxGS^RJWYye^QF0%hFW;tR$}QGigF7d- zZux%hZGrI1l1(VP7lc<3~A%9Jxyj7IPHxTf+X#`YP8o;ZUAK&(%E+H(v^W59(Uv?N^aEN3Je8 zI67HkJvzm{F=TignOWJ1`VTG!V}>O74@)FR;8b2j7x^usxAHPFm80mV97B=vN;sP7 zFokDo_!1z7Sg#7XeIQSjyJ;kvsq(u>B$}x$(HOXj{~=`#nWqB2&PwaRknYAC(o5m- FzXOy_M{WQB delta 4691 zcmb`Kd2m!!7RJBt-M4f)4OyBd=|Dn^7(x~jwg4@%#}Jf7A|T3=HiVF*>4Xpv*9N07 zilf4F19e;xR0NlrHj0WYLY0m<<$@wABjC)G;5wsHs5s|!5=8~Aq5P+Fa^F4g{O-Bm zJ?FlM79Fg2zkKZ37XS?A#wXlcJrQ>>6dG9{ZmJ45xsieIJvfGOgjF-YWNt&#r7nWd z_b-0F$VH7X=QlOhR5rP&6N#;Mc`!V`WPU@ivdTqMX6(Q2KAG;Kcv@BAg*A=!VHe$m zvGsl#ml*VT*nu6L7~xrZ)uQpU?WDw%_%i2FqK8RLw!i4;H9L9eV`tl)(4$)_(=7Ul zq}t%ZU|}d2t}ZMS;_9kK54*6dJt3jEODZ!w?8aomRTFNS91Ja}isNZK-C~w~UxH6{ z=Na}h37PC+znjptOHZQ1C;`t5Rb__jXH{jonaw;84CV_=TBmIG^01IavYuc=LsfVd zQDC#9*KSDg*fSCn*~hL=95u0@WGBmUE%tB#7D()-`f|xoxZ2G@Jkw%;@W!BP>I)~x zc#}M>3eNR#F!Ln=4bD&~?B);_TO2Br?G?%1L>Gq>a3hH$JsianyRk#5#Zs189BpSN zrKmA77D(!Ap6jfCti4*+n4v7?;&}U>q&fEFp6TK| zLS;6H0_GF(L5l@K%p z=Vt~hn`#z{W)|D?JLP9z<7B#RWT|APQqt5^-{|6>97!!*5tG#Q_Dh|*r~Fx@*A}?4 zaofYeCRvP&H?8#b;7U8km(k%?aakA)#fERU%YB7hZ8!V6^KN^cueaM-^SvJ4$NTNC zeWkt!CD_P%$w+0B^W-59*Gh6Hc3#dz`-9H8bUhW9a=jk$qa)JL9bHj?bQH-+8H{e2 zg-p!BX;_FXEXV0sB{Lqt8F&cUcmzGL898_rJ@K~qe28B72!;4YynjG%deDcbp&xsq zKl`GX#TdX57|0L?aUKF(j5B$g9McDJ7B@sNgil~7|B7LJ1;e=qBX~fZKEW7%j&pbf z=V}JVYH1j+b;ks)2hP*_Vxl%3ox)arE z4X#w{aFu!-5%oM4tJiV0dJoNNAFfe{aINmcQr(YbdLgdU&%*V3DVp{3u=1&YcP-L7 zceo4&IsjHC5#k9wETcjBmJ+-sjR3ldXX&S+oxjk14~1I5elj`A!qRk6$GT7?O|xK%jEc~zd5!=fC~ z!n0d=j=a>NaNGj!JO@YJ@jn z7w^aGY{46R4sUWZ-r`p5<_^5gm+=nYz#i_#yWEexays_#8@#UpA82vdr+M%XEfpVX zr;A;H16nZ-YGd({HUaS>4 zgVk0J=U8X6#u~#~YYOYE*$i0?Y(PA~?NVc<7RcUD6OB36d16UNv>J0TLrmFFs}VC% z0Tr`?V(EypYH%?srIe%^AK6QCOCu9m4olRroac+>5{)e5B$*p0N@?a~vD~7U%Q!{6 z;zcp>yg^7m$r+ppw{a^C8iQ;)S&X-4%ki$39D7hJx$h_0Y|U$( z^zqhQ)giuZ<#lkkEknlIpkxdo*~FFT_tcX7!Hho&-*=d7AtNu({MWoPvo zQE{TUf-) zB>^HWv97Rl3rkC{%=?RwhPM+VcGdREJc0N|Ioa=DJ*XZ%Wh$LTUg!^mOa9gh|AlA6B6Nk+qZP019g?$W|o{9(hVm-x_MA~I-ulJ(9$&Y*Axb7I)=*S zbB1Qg#nEN&>h}{;?T<*cf^@WBX?ZM9$y-l3O*fu|$tO&mg((HaQoaXiehib#@Jy{M zYP58FSO1@w>UeWon(7>;{_RY!oifvklQ889Q=Ty83sZqG^%AB+Vd^bReSX1YAJ0@= zT7FCH!guO zu9HyJ3RRs@g@kIZP=$r6UZ~~?Rpakc{pDv=IgvP7!%(T`me3!PmgthdHjf diff --git a/bin/resources/allcontentchilds.png b/bin/resources/allcontentchilds.png new file mode 100644 index 0000000000000000000000000000000000000000..2154d94d2bdf85a9bd082cbe754a6afc14c4e8b0 GIT binary patch literal 1823 zcmV+)2jKXLP)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H12CPX$ zK~z|U)!BQn)m0S-@XtDz3y2SVWSNPYjHZ%~&q2nl#9n4Psp;4_lU5EsN}~sZsc<-; zr8rGKMheZwsiqP~MeX6Fsgsp4f%q;VpCBj-ipZOLR)73{Hx6*mz30M}vG2^DbI#s- z?e+bwv-VzVuU}*)5OF*Xz;v09P$; z_DrVM>1ZVX9P_?YkUbo`V-=o8;Ji})d)OAE%JvdE8h-Ej?vP&Z^9Lr=>KpodCif+W z;Kows_;QW6FnFW2XJK6vy*-kyH1V0e^{gBy-~3bU55$I!xxQ*jWcWaiRd z>*)r)CtczW7LCNOxd4xLuD27%KTAwy$Ont__PV|x+KA02-H9`qfg^A_=0Y2lQTPx2 zmoZkvj$5jy5nD_eog3pe4EqO{FDSbQ5!*2u&xsf-Vw=8D*Egg)k-2sR`|gWbOj%03 z9N8IHVvdMW?ZwHm+2~W!5it~}uHesyXMW>AuDBR$3g3o3Fm(A+Y; zme%{*$4S!utxPIU1nKwWj5q5O)cGsi1-i&^vZnWJYcC`xz5jfBX%Nh-_04g z3?FD1T7V;EF6dhyZTzPun5*X7Tj1~8CYL2|l@{+v4%xgcZ)+iQxy;Kk6lYQRpXh3!Crhuz3{iyTK0^vLOILSS+&Ak@ z#(N~a4zK3;ylwN?^&U}+LlmUfG@H}YMqH~Xq-;G@{->`g>FzBZ9+7tKOHMta&CAkx z23p)~N=w1zy@q}ewHSo`Ra(4J)V-e7qN*9SI9M27ZmynD@y{HWv*Y?0V2Lpp(jwOs zexKv>o-kFrg=Q%Vfb&`q9$dB)w0TK~Cri0m-HU-k6_uvLgilD<;s#-U3zWZr;o1%9 zXQ81uNcen?&p-Ag8?_i%5Y*xGLDjl z;(m;gJ_ah53U3={j){&?x4q)9Sft%8)_T=id-X$qFvwq`7PsISMOEluiqh-Vik5Aikq=gm?+G~Ns8Eiv!aN2wN+N?>fo>VG-hgZ z9%g#Rx%fN2ikanFn;8%yIcRmgQwRSGW_CR7}rm{u|4(+C_1^YfM+9rVlln&@{MYHJ?YD zaDR)+8idWpVD*+Z=f-#gOPU#nZb-)!u@?ra8{TWR;j?&2IJVcaMS`|4CdII36Pkzd z4yWJ}e6iPR)5*9{I;}TiabvV&FI=PET(&vs;#{1Dj9Tp8vf?684bE!*0f$B{`gb=S z^s^k#dd+^qt+sWaqLfz0?2U!i=N|30#|rJvEJwbQm*(5?!#KklD=|j#vWwz1%$q_= zyF@MeWi{7jHAj}?$3a%}(DL`l@_{ONzmz4R1ELm{tmZuHOTtf=pBI&%-v<*M1nN4% z1iRrCOc#FJja53an=~0$;ZOJ*?h+p9Q8FE=c9)sb$xb9?5FX|G&)g{tLc|Ap-29F?Rp} N002ovPDHLkV1k#1f_wk~ literal 0 HcmV?d00001 diff --git a/bin/resources/allcontentchildsmini.png b/bin/resources/allcontentchildsmini.png new file mode 100644 index 0000000000000000000000000000000000000000..35c4f8585c4e0a1535c1dc97f7390df8f6faacc9 GIT binary patch literal 915 zcmV;E18n?>P)ZmNr-n;;!s1cBWI{kt)vWLrT5 zMGzF>NXWtpiYQZW+AczJda;NIMYKTYiZopsW1hLQr;GP>JLhaCHTuF2-rw{5p6~Pg zo^r4K#i@Z|~GQ(Z>a6IS@;t=Ka z*)0a}0iMA+{D5s3!6I96OD}A$hU9N zH^u`vxQ`9(%)5kbof>5ONAXeqyjPZ<74!MyZ?=>e9b+tbBUtD%iu?`EVnL<6?xH0p z9}P~w&B57BsA$ua6N8k}Q?j8ufdhFoQ<$Y-uA*V*E5&P>^9r{=M(Z%=TiA^EMT}KB z$epZ`4bpVnYn3(b)?@oj>MbnprX%qP4&m0u8ESGAM`t2Pucgx_v_(Yki~(f$L`rw! zCX}jE)SVWhr>W=2xX(^U_RlB+A{f6759Nm?Xjp;Sei;T(!WQJTzmn$(9O$;sTw zko;Sdbm_tw4Zg3rODmqnpyXE^uZebss{i7 literal 0 HcmV?d00001 diff --git a/icons/allContentChild.svg b/icons/allContentChild.svg new file mode 100644 index 0000000..7e3089a --- /dev/null +++ b/icons/allContentChild.svg @@ -0,0 +1,213 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + TXT + + + + + TXT + + + + TXT + + + + TXT + + + + + + + + + diff --git a/icons/allcontentchilds.png b/icons/allcontentchilds.png new file mode 100644 index 0000000000000000000000000000000000000000..2154d94d2bdf85a9bd082cbe754a6afc14c4e8b0 GIT binary patch literal 1823 zcmV+)2jKXLP)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H12CPX$ zK~z|U)!BQn)m0S-@XtDz3y2SVWSNPYjHZ%~&q2nl#9n4Psp;4_lU5EsN}~sZsc<-; zr8rGKMheZwsiqP~MeX6Fsgsp4f%q;VpCBj-ipZOLR)73{Hx6*mz30M}vG2^DbI#s- z?e+bwv-VzVuU}*)5OF*Xz;v09P$; z_DrVM>1ZVX9P_?YkUbo`V-=o8;Ji})d)OAE%JvdE8h-Ej?vP&Z^9Lr=>KpodCif+W z;Kows_;QW6FnFW2XJK6vy*-kyH1V0e^{gBy-~3bU55$I!xxQ*jWcWaiRd z>*)r)CtczW7LCNOxd4xLuD27%KTAwy$Ont__PV|x+KA02-H9`qfg^A_=0Y2lQTPx2 zmoZkvj$5jy5nD_eog3pe4EqO{FDSbQ5!*2u&xsf-Vw=8D*Egg)k-2sR`|gWbOj%03 z9N8IHVvdMW?ZwHm+2~W!5it~}uHesyXMW>AuDBR$3g3o3Fm(A+Y; zme%{*$4S!utxPIU1nKwWj5q5O)cGsi1-i&^vZnWJYcC`xz5jfBX%Nh-_04g z3?FD1T7V;EF6dhyZTzPun5*X7Tj1~8CYL2|l@{+v4%xgcZ)+iQxy;Kk6lYQRpXh3!Crhuz3{iyTK0^vLOILSS+&Ak@ z#(N~a4zK3;ylwN?^&U}+LlmUfG@H}YMqH~Xq-;G@{->`g>FzBZ9+7tKOHMta&CAkx z23p)~N=w1zy@q}ewHSo`Ra(4J)V-e7qN*9SI9M27ZmynD@y{HWv*Y?0V2Lpp(jwOs zexKv>o-kFrg=Q%Vfb&`q9$dB)w0TK~Cri0m-HU-k6_uvLgilD<;s#-U3zWZr;o1%9 zXQ81uNcen?&p-Ag8?_i%5Y*xGLDjl z;(m;gJ_ah53U3={j){&?x4q)9Sft%8)_T=id-X$qFvwq`7PsISMOEluiqh-Vik5Aikq=gm?+G~Ns8Eiv!aN2wN+N?>fo>VG-hgZ z9%g#Rx%fN2ikanFn;8%yIcRmgQwRSGW_CR7}rm{u|4(+C_1^YfM+9rVlln&@{MYHJ?YD zaDR)+8idWpVD*+Z=f-#gOPU#nZb-)!u@?ra8{TWR;j?&2IJVcaMS`|4CdII36Pkzd z4yWJ}e6iPR)5*9{I;}TiabvV&FI=PET(&vs;#{1Dj9Tp8vf?684bE!*0f$B{`gb=S z^s^k#dd+^qt+sWaqLfz0?2U!i=N|30#|rJvEJwbQm*(5?!#KklD=|j#vWwz1%$q_= zyF@MeWi{7jHAj}?$3a%}(DL`l@_{ONzmz4R1ELm{tmZuHOTtf=pBI&%-v<*M1nN4% z1iRrCOc#FJja53an=~0$;ZOJ*?h+p9Q8FE=c9)sb$xb9?5FX|G&)g{tLc|Ap-29F?Rp} N002ovPDHLkV1k#1f_wk~ literal 0 HcmV?d00001 diff --git a/icons/allcontentchildsmini.png b/icons/allcontentchildsmini.png new file mode 100644 index 0000000000000000000000000000000000000000..35c4f8585c4e0a1535c1dc97f7390df8f6faacc9 GIT binary patch literal 915 zcmV;E18n?>P)ZmNr-n;;!s1cBWI{kt)vWLrT5 zMGzF>NXWtpiYQZW+AczJda;NIMYKTYiZopsW1hLQr;GP>JLhaCHTuF2-rw{5p6~Pg zo^r4K#i@Z|~GQ(Z>a6IS@;t=Ka z*)0a}0iMA+{D5s3!6I96OD}A$hU9N zH^u`vxQ`9(%)5kbof>5ONAXeqyjPZ<74!MyZ?=>e9b+tbBUtD%iu?`EVnL<6?xH0p z9}P~w&B57BsA$ua6N8k}Q?j8ufdhFoQ<$Y-uA*V*E5&P>^9r{=M(Z%=TiA^EMT}KB z$epZ`4bpVnYn3(b)?@oj>MbnprX%qP4&m0u8ESGAM`t2Pucgx_v_(Yki~(f$L`rw! zCX}jE)SVWhr>W=2xX(^U_RlB+A{f6759Nm?Xjp;Sei;T(!WQJTzmn$(9O$;sTw zko;Sdbm_tw4Zg3rODmqnpyXE^uZebss{i7 literal 0 HcmV?d00001 diff --git a/src/evaluer/evaluationAttribut.java b/src/evaluer/evaluationAttribut.java index 17de45a..6a223ed 100644 --- a/src/evaluer/evaluationAttribut.java +++ b/src/evaluer/evaluationAttribut.java @@ -4,6 +4,7 @@ import java.util.Enumeration; import cXML.node; import list.listeAttributsAnalyseWriter; +import list.listeDesNodesEvalPlacement; public class evaluationAttribut { @@ -150,6 +151,7 @@ public class evaluationAttribut { /** * Analyse tous les attributs et les contenus d'un node.
* Les attributs et les contenus doivent posséder la caractère ‽ ou ‼.
+ * Ou le node doit posséder des attributs d'analyseWriter comme allContent="1", etc...
*
* @param nodeStudent : le node de l'étudiant. * @param sujet : le node du sujet @@ -163,6 +165,7 @@ public class evaluationAttribut { while(key.hasMoreElements()) { String k = key.nextElement(); + // evaluer les attributs de Writer avec l'évaluateur ‽ if( sujet.getAttributs().get(k).contains("‽")){ if(nodeStudent!=null) { String valueAttributStudent = nodeStudent.getAttributs().get(k); @@ -207,6 +210,7 @@ public class evaluationAttribut { } } + // evaluer la non activation de l'entête. if(k.equals("evalEntetePasActive") && sujet.getNomElt().equals("style:header-style")) { if(nodeStudent!=null) { int nbA=0; @@ -231,6 +235,7 @@ public class evaluationAttribut { } } + // evaluer l'activation de l'entête if(k.equals("evalEnteteActive") && sujet.getNomElt().equals("style:header-style")) { if(nodeStudent!=null) { int nbAs=0; @@ -249,6 +254,7 @@ public class evaluationAttribut { } } + //evaluer la non activation du pied de page. if(k.equals("evalPiedPagePasActive") && sujet.getNomElt().equals("style:footer-style")) { if(nodeStudent!=null) { int nbA=0; @@ -273,6 +279,7 @@ public class evaluationAttribut { } } + // evaluer l'activation du pied de page if(k.equals("evalPiedPageActive") && sujet.getNomElt().equals("style:footer-style")) { if(nodeStudent!=null) { int nbAs=0; @@ -291,6 +298,7 @@ public class evaluationAttribut { } } + // evaluation du nom de la séquence. if(k.equals("evalNameSequence") && sujet.getNomElt().equals("text:sequence-decl")) { if(nodeStudent!=null) { retour = evaluNameSequence(retour,nodeStudent, sujet.getAttributs().get("text:name"), sujet.getAttributs().get("evalNameSequence"),"Séquence"); @@ -299,6 +307,7 @@ public class evaluationAttribut { } } + // evaluation du nom de la page if(k.equals("evalNamePage") && sujet.getNomElt().equals("page")) { if(nodeStudent!=null) { retour = evaluNamePage(retour,nodeStudent, sujet.getAttributs().get("style:master-page-name"), sujet.getAttributs().get("evalNamePage"),"Page"); @@ -307,6 +316,7 @@ public class evaluationAttribut { } } + // evaluation de la propriété personnalisé dans la structure du document if(k.equals("evalTextUserDefined") && sujet.getNomElt().equals("text:user-defined") && sujet.chemin().contains("structurepage")) { if(nodeStudent!=null) { retour = evaluTextUserDefined(retour,nodeStudent, sujet.getAttributs().get("text:name"), sujet.getAttributs().get("evalTextUserDefined"),"Propriété personnalisé"); @@ -315,6 +325,7 @@ public class evaluationAttribut { } } + // evaluation du numéro de la page. if(k.equals("evalNumeroPage") && sujet.getNomElt().equals("page")) { if(nodeStudent!=null) { retour = evaluNumeroPage(retour,nodeStudent, sujet.getAttributs().get("numero"), sujet.getAttributs().get("evalNumeroPage"),"numéro"); @@ -323,6 +334,7 @@ public class evaluationAttribut { } } + // evaluation du numéro absolu de la page. if(k.equals("evalNumeroAbsoluePage") && sujet.getNomElt().equals("page")) { if(nodeStudent!=null) { retour = evaluNumeroAbsoluePage(retour,nodeStudent, sujet.getAttributs().get("numeroabsolue"), sujet.getAttributs().get("evalNumeroAbsoluePage"),"numéro absolue"); @@ -331,6 +343,33 @@ public class evaluationAttribut { } } + // evaluation du placement du paragraphe + if(k.equals("evalPlacement") && listeDesNodesEvalPlacement.isPlacement(sujet)) { + if(nodeStudent!=null) { + int calcul = 0; + + node nodeSujetfrereAvant = sujet.retourneLeNodeFrereAvant(); + node nodeStudentfereAvant = nodeStudent.retourneLeNodeFrereAvant(); + + if(nodeSujetfrereAvant==null) nodeSujetfrereAvant = new node(); + if(nodeStudentfereAvant==null) nodeStudentfereAvant = new node(); + + String A = nodeSujetfrereAvant.retourneLesContenusEnfants(""); + String B = nodeStudentfereAvant.retourneLesContenusEnfants(""); + if(A.isEmpty() && B.isEmpty()) calcul++; + if(!A.isEmpty() && !B.isEmpty()) if(cXML.StringSimilarity.similarity(A, B)>0.92) calcul++; + + if(calcul==1) { + retour = evaluPlacement(retour,nodeStudent, sujet.retourneLesContenusEnfants(""), sujet.getAttributs().get("evalPlacement"),"Placement"); + }else { + retour = evaluPlacement(retour,null, sujet.retourneLesContenusEnfants(""), sujet.getAttributs().get("evalPlacement"),"Placement"); + } + }else { + node nodeSujetAvant = sujet.retourneLeNodeFrereAvant(); + retour = evaluPlacement(retour,null, nodeSujetAvant.retourneLesContenusEnfants(""), sujet.getAttributs().get("evalPlacement"),"Placement"); + } + } + } @@ -564,7 +603,8 @@ public class evaluationAttribut { /** - * evalue la valeur de la propriété personalisée dans la structure ("text:name") de text:user-defined + * Evaluer la valeur de la propriété personalisée dans la structure ("text:name") de text:user-defined.
+ *
* @param retour * @param nodStudent * @param textUserDefined @@ -585,7 +625,8 @@ public class evaluationAttribut { } /** - * + * Méthode permettant d'évaluer le numéro de la page.
+ *
* @param retour * @param nodStudent * @param numeroPage @@ -606,7 +647,8 @@ public class evaluationAttribut { } /** - * + * Méthode permettant d'évaluer le numéro absolu de la page.
+ *
* @param retour * @param nodStudent * @param numeroAbsoluePage @@ -626,6 +668,29 @@ public class evaluationAttribut { return retour; } + + /** + * + * @param retour + * @param nodStudent + * @param contenuParagraph + * @param point + * @param nameElt + * @return + */ + private static node evaluPlacement(node retour, node nodStudent, String contenuParagraph, String point, String nameElt) { + node item = null; + if(nodStudent!=null) { + //compare la même valeur "contenuParagraph" pour obtenir les points mais si un vosinage du contenu. + item = retourneNoteAvecResultatsAnalyse("Placement","", contenuParagraph,contenuParagraph + "‽" +point, nameElt ); + }else { + evaluation.IncrementPointTotal(Integer.valueOf(point)); + item = new node("Placement", "Erreur : -"+ point, "" , "null", contenuParagraph, 2, evaluation.getPointEnJeu(),nameElt); + } + retour.getNodes().add(item); + return retour; + } + /** * Retourne le node avec les résultats de la comparaison entre les deux valeurs (étudiant et sujet).
*