From 5e1e575b90aacf253f4707c433ea2612842d3d1e Mon Sep 17 00:00:00 2001 From: aaa Date: Mon, 21 Jun 2021 12:32:29 +0200 Subject: [PATCH] poprawki do algorytmu genetycznego --- src/genetic.py | 1 + src/img/gate.png | Bin 0 -> 6581 bytes src/main.py | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 src/img/gate.png diff --git a/src/genetic.py b/src/genetic.py index 59d3ff5..5745692 100644 --- a/src/genetic.py +++ b/src/genetic.py @@ -27,6 +27,7 @@ def genetic(goals, AGENT_MAP): recordDistance = population[i].fitness best = copy.deepcopy(population[i]) bestGeneration = generation + print(bestGeneration, best.fitness, best.genes) for i in range(totalPopulaton): n = population[i].fitness * 100 diff --git a/src/img/gate.png b/src/img/gate.png new file mode 100644 index 0000000000000000000000000000000000000000..8733215cebc3d145ec9afb2129e7d2b4b0340cda GIT binary patch literal 6581 zcmV;m8A|4fP)U8P*7-ZbZ>KLZ*U+lnSp_Ufq@}0xwybFAi#%#fq@|}KQEO56)-X|e7nZL z$iTqBa9P*U#mSX{G{Bl%P*lRez;J+pfx##xwK$o9f#C}S14DXwNkIt%17i#W1A|CX zc0maP17iUL1A|C*NRTrF17iyV0~1e4YDEbH0|SF|enDkXW_m`6f}y3QrGjHhep0GJ zaAk2xYHqQDXI^rCQ9*uDVo7QW0|Nup4h9AW240u^5(W3f%sd4n162kpgNVo|1qcff zJ_s=cNG>fZg9jx8g8+j9g8_pBLjXe}Lp{R+hNBE`7{wV~7)u#fFy3PlV+vxLz;uCG zm^qSpA@ds+OO_6nTdaDlt*rOhEZL^9ePa)2-_4=K(Z%tFGm-NGmm}8}ZcXk5JW@PU zd4+f<@d@)yL(o<5icqT158+-B6_LH7;i6x}CW#w~Uy-Pgl#@Irl`kzV zeL|*8R$ca%T%Wv){2zs_iiJvgN^h0dsuZZ2sQy$tsNSU!s;Q*;LF<6_B%M@UD?LHI zSNcZ`78uqV#TeU~$eS{ozBIdFzSClfs*^S+dw;4dus<{M;#|MXC)T}S9v!D zcV!QCPhBq)ZyO(X-(bH4|NMaZz==UigLj2o41F2S6d@OB6%`R(5i>J(Puzn9wnW{e zu;hl6HK{k#IWjCVGqdJqU(99Cv(K+6*i`tgSi2;vbXD1#3jNBGs$DgVwO(~o>mN4i zHPtkqZIx>)Y(Ls5-Br|mx>vQYvH$Kwn@O`L|D75??eGkZnfg$5<;Xeg_o%+-I&+-3%01W^SH2RkDT>t<8AY({UO#lFTB>(_`g8%^e z{{R4h=>PzAFaQARU;qF*m;eA5Z<1fdMgRa77fD1xRCwC#UAvYfM-k2FGZ+{;vmSCW zBtC-AL3{z9fiS^A|Aa3YxEy4#doVCB#_mjIJhHlHDylQGb%O)!_Re%?SKYdCBQi2V z&}g)LyYLdw2rL?bMI*3iGy;o8V9^LH8jZlB5m+<=i$)``Xap9Gz@pIzEE<7DBd};R z0*gjq(FiOW?YKSN`h!1o#qrY6q@jIm(pp24FR!CXdw%_y*6`(Lx8Kt5F|xgX8~yyJ z*OhGl`~2mdUev~4-(!N}i+kZd4dN1F%y?(FOeLFGl1@&&?KFi*v*4UBquSJd|3ou!6R+~{RJFdQhniDcuCro*Y$hBz`XyL?Z4amN%$%8@5>FVk)3z> zyfT<;Aj5Y<2v7Z3ql1cmXkgyOzqh^`^17Cnb#A}gzb0?M$(w-%^9B4(l8&$1O;0Iy zE@yLqh;Ok61a>}8f`7*l@|G?3;ceeVuH0f7KvsVe)I0aT)q}rZ@A%P;-WTRmqHB$_ zfF%RMM#vANr+fVL%a!FLxKQJ#e*d%O^(M&9vk3D5#jBH>9-EkddeDtI{Tf4B=PBJc zY`c%;3m-{G3Nr9HZ-Lh3c2G%2kJl8z-o?T2-{Ck=u5ugP?K*f<-_P z=^pAM^`f~+Tr?7?C2@-E<@wt#b@cpW@Z2H%R4c9bo@~77A+ru&0(eQtabg^(gpA$H zy%EDY(bci5Lg1g|4gCB@#u|OO_?eVJlqiAh?BRziQgP%$^u-a!nEPCS!9#=_0|E@# zHIApT!(|eDuSj8vae`2CWm}C+!Stca_E`vMz}^R(&sfpdi6WZVbzmp5+q=g~#c9&f9ZF`b_$I*QI%HSg z%HTP?^|Rs9c5%u8L#MW%ti;s_Z1j@|5*iYwI&O_CF^q}jic*x_c+hj3&5(HzzD;Av ztr+|vc>yRF0wW0FqE&SGE zvg0~a-n!iY39{&8H|F0n%Fc-kFh&qZllD#U?f)pZ5==sZ^jhGHoy^EsbD{fx4>fxU z#cfpBKmaN`Jx+YUr3goiH%iuyf(tE{Ehp$4y$@T^IXr(|U>FK6ouY+(|IX& z!%zvpl0dS;#CG}uL*iENM2Cv9 zB#^T&H$V(rwFVo7;Rq6|5eG}S<jG$(74%)Gk4-!XBeeWh|Inuun$fN@y-!?pnGVWr^EXR3K!NDE%76Kj=d2 zh@JH3HRp)5J{o1I#N8x`2dP8t!$-P$b(31DSm=k+qh==)?xye)3a5hVaq3nK8?O}0TkQCuQ4&dXu!w z$xaSm++~txt4YNvxp;peVnYeI(pCaQ$%i(`?jg7u5(`h4T}!r#DG9tKHG3D0 zg^=RKr3Jm*_l^R=vn)aWs|QI`W8vj=l$sTj=x7emI#94~SgRrI1m;%8`#nJEw!-@Q z%~6!;<+`-El*zvXx>SY)yBD}|pW!a9u(>VJm#^||P@VN%Mws!AeY-QB#42{=lKudw zf*O0rGF;(-%sYY%GTOC@YubE6kYtc6DWMaAB|G4Xipk`m7~(PE<+FT9x@T`Fn?b0Z zYytsk0W0l(ZWLF={As}2D{+eppXVTVXQ66(W>@wtkZ=wN9#`7w^)tIP2!j`**=>--kU(=CBlg@zA*4elYJO=6s?A z#oBj_3io%(geiw5(+^oGho_9EW{Wb$(IKsp!on3ne@F4YAG)>ycTsJvz);)0%&2Qf zafR1fYLKz&f=f&VuM8616M&`9tsyuRMZT(=# zYyd*ms?A#M#5;94j(#y`3kj=LG}gFR>~xI<*TrSOi4d)tLu`qWU~f;yeqG$z55lOv z{TM`k-?Y76vUk^5P=TsPzBD?++MLyUmCS0COUAz( z6l$%?I?MkJ1I>JAjrDwmG6|{5&am%dC<7ffk+E)@sz`PH>M7al!wPD&ft*lMemFtu3oV!&T`S>W z$2FCxdEXzwt!MAi>LnZesFkcr_)EqD$xJIc!=AA$i^<%m&=020%Y)F)jSB5l`_T~5 zDZs*RQh|LNYHO_AMr*0!{Tk>9teW<1@Y+Wc>0>|)xF@h=DBkH3SK%*lcXPt@ukjKj zm_)k#NK*ZE1Pge4euK1saq&GlrmVU0M@LJoBf ztlAmT&CG13t>7ASPqIJdq5t!;er#QA?)3-n!>V2_Hrt+F6S?r09%EbS~}yw>MF~2dY4oxxa2+q%@m2TRpdHizHgm3xgEEJBnr-^SXRR8E@#t#h44@P zbbEG9UISM8bm;Uv*2ivV$!_ToP%A)bvrnz5dpWt#&o}Rqon!>9ma4LUldgyI)B~$< zg<<`0Ii7*8uBeXu#L0{$-Kgp(4Xrk3<<`z!j$<61 z8|>MNIjp+eG@8}cPoJDD-upQ^EnqB)_xb?qUy&qFlhSP_t{Vl@4okQ~2_((&`zl9cT~Q`4)=Mt_Mv6%Hqp*?g}UzdIr$S( zGVi@xC2uRiCf+`??o9r4vyp*{e2lS?5^j zFog_2lr`gkc6Q3)I!R1pti40_SiK&=1(!QV~EWtowCvGKH8T*Jwx+Z5{T? zyI*OAeiDdwf@)>{nqJ*7>b6T*t?2*@%qx5zvJ%;2%;deoD5)l=JOi||HI}|>WoAO}Cm(3FIBR@l zLMmn6-~f#!++Z zlkhk}$RtFCb_1I3Z#CAkW#!Xn>GWAFY0;5;+6r0=&1WQ~LLMu2fOLr~s4J*oD~qoZ zy3N?A;sfv7lJ=iAPISMAE)KfFEdmrCPhCp3!c zoSaoP&EWIwdBw?>j3vs|=4-Ty(2`Kr=j`$(%+f*Fke)nMA6mW3ljON=X?@;paTsI5 z%HmzzpPHJBJAHI-q_EiCeGRVCRqy>P8QrcAW!^tHmO}f}aA6I^=U zm-jByYuf5K|lsS`6dHC10qj{6>Xy-ty z84WC{$?fFhU;V(Q(Y67tg2HM+*wqV}>A(^r+-2B}msU%-M;p<3G;r7zMsc6Gr-4?_ z5!!;xXvcS|#*(lZj&1f#s~Q{XEx8gM{jTMy2&okm7F^$0%m&sz#_0-Ii3?*Mn<(DV zbls?Qabb3S5A8fy;RIiE$y%uO*>s52VWqco;$y6nfMo&XkJ;1eYAhQC=5E0y3>)A6 zrZ;v*$p~5%*1|A85J^Niy)&5B(A=>J`R)42_uZGF4&)Y3 zjSUya7l{g?(9Xm4Yq-KF*^omDN%dHs!(IeD;k8EULGxINns?p9;ol+E(kj`%g4cfC za(kMca$vP3ZVk}x>m23v2w#Z=X@qs=+*gB@bj9UI?_H`Zj2m*()=EGirAt<7g4Bw2 z!fNd}v5YI!eZmUnGW z^siBD$W+6M+y&!%rU45kxxi*?Ys+?hfOVoP{HW@AFxVO($g0_YRbt`u9r`-?GY-4L zsQaj`%A(axEZC_clH_#~<`trA0OCoMNr$?EU3cQ|5AGeWPDw~Nz!h5TAF!a+NioQ- zADYHk{yZ&iNJr2rr5JF$zR;z$4Kb}7<-un$p-?f39wGO;|gp*f5~aheUP!@{*^MISz0xXH98M{{5>5qp{*2=S3OD+LMkLkZ6-@xYY^IMe3j*Io-!6=mnJQ{2QO_7 z%qB;LaiI+PYCT7oXGyLQLs?IFt;JATk^CW7_~~^?+lKR3yhjg^ZaCh0Eu}veo!{fI zmL$zUIy|~pSS0g6e3du8^svS{PyW&F&sTXq=aRWB8sow=jg{4?i&hO<6EzllG(4Vk zN0JXpD@|t3>M`VdmOUNE_(q&$uJt+V9=rjR?_-O#h-Id?fCYu7%#z z1gXV4;k7z@Wo<-XGVvZQhAwg)SlPT}8CNKDkxNH{TmOv`;$6s255ZV{kF4W;vQnZ# z&Z~b6&XPp6oHz*c^OC+ca-LStzTOSMbS>$0SEy$eGD=)04vdKc6%wRz?@^9vs_*=w zze!3b#*~_OU5lm9?9d^u#$8C!%a`nB(bfc0|4K%Wtfaav720@0MG;qsoduD{R^Y6tyL*ACPy-0=IUu;|a#nM}7m^w#Tyh{a?%+UJttRDj zq|Cu?GjPQg|1`@*YwZubZ>8)XPO?k;tqI1aig%s6+B`M4rPpAnsBICF@{ehK-kX~V zO($4eW7+H#x&}s*_X;HxeY&L)GhA!JZK}rVU0=U5sG|&8U3VDm7Ur}jPRV2W)6kMu z;z~Q0pTvM_o8&g}B(x1xeWwyuWvu|NP1Yc-CgosL5b26!qUA6_x<-81%lMp9r^DiX zb9|$1OmbE|D9Lc9B$9S~59hH&okQci!Zq98-7_HWxU#9k+IY!WeM*=un)LpX3T*svD@O9wYg1oV5<88<CqkHB#lL}{+N(DE^HE`LW1m(T;)+qbcJ+_ zv@~GRsIUku+8e+G0*jWXtzO_IwMO^SDBlx-#X%>JCS}OyEnO2qy%H+KsUGuUu`_)yIjlMZZmd4qt3~+YHVeX(u?7#5(!dK^HuxCsRUJB z#)8wwnUYszY-5}@?i^hcdbXB&1Nt^y9p=>9t>e*j@r8`|?;3%g9Yh0R~H%p3^ n1}nkuMa?ISCPE*lg#Ql!-&~)6b}Vz>00000NkvXXu0mjf&}XmF literal 0 HcmV?d00001 diff --git a/src/main.py b/src/main.py index e14a057..2fa8d6c 100644 --- a/src/main.py +++ b/src/main.py @@ -31,7 +31,7 @@ IMAGE = pygame.transform.scale(pygame.image.load('img/wozek2.png'), (75, 75)) BACKGROUND = pygame.transform.scale(pygame.image.load('img/background.png'), (WIDTH, HEIGHT)) DOCK = pygame.transform.scale(pygame.image.load('img/dock_left.png'), (75, 75)) TRASH = pygame.transform.scale(pygame.image.load('img/trash.png'), (75, 75)) -GATE = pygame.transform.scale(pygame.image.load('img/shelf.png'), (75, 75)) +GATE = pygame.transform.scale(pygame.image.load('img/gate.png'), (70, 70)) get_pix_from_position = {}