From b1b81fdf43dce95de46bd39cc3f8bb8ea025d1f0 Mon Sep 17 00:00:00 2001 From: simpleguyon Date: Sun, 18 Nov 2018 14:52:20 +0000 Subject: [PATCH 1/5] Done --- __pycache__/__init__.cpython-36.pyc | Bin 0 -> 212 bytes .../__pycache__/__init__.cpython-36.pyc | Bin 207 -> 231 bytes .../__pycache__/build.cpython-36.pyc | Bin 1447 -> 722 bytes q01_rename_columns/build.py | 28 ++++++++++++++++++ .../tests/__pycache__/__init__.cpython-36.pyc | Bin 213 -> 237 bytes .../tests/__pycache__/test.cpython-36.pyc | Bin 2189 -> 2107 bytes 6 files changed, 28 insertions(+) create mode 100644 __pycache__/__init__.cpython-36.pyc diff --git a/__pycache__/__init__.cpython-36.pyc b/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000000000000000000000000000000000000..db1f0d6ca7fc262ab3e50aed877e64a79d1d9240 GIT binary patch literal 212 zcmXr!<>hLv`4}C_z`*brh~a<{$Z`PUVh$jY!Vtxf!Whh;$y8;^)y_9P~5tb5r$;Gjj`aQqxN-^Yiq>^NX^J3lfu4^^@~cQuXt5Dsu}mlj94D p^0QKtOXBlV%k|^qGxIV_;^XxSDsOSv_HFoYeHv%KSY2@cg3e;)2BFRQ=@q xlvMrvoXXsS%;fljqWrAX~p|!JBjC)aPrDI8cZcKhoWo|)ca&de?QGQlxa!E{~ Zfnj`6YF=V)YJ75jPHAplam>V%asWd|8I=G4 diff --git a/q01_rename_columns/__pycache__/build.cpython-36.pyc b/q01_rename_columns/__pycache__/build.cpython-36.pyc index 56daa0d09554cf72af8f329cc380af32570a7b8a..9b6ad4c5ee1f04504c15e6ec21be3ec5e26daa4a 100644 GIT binary patch literal 722 zcmZXRJ#X7E5Qa%gwp7J-^U*JF1~O@}T68Ufpc%3S1zaG2ItZ$caO6m$N>T}A$Wz)e zzo37h{YzXsW$fCiCrd5@l)$~h!{fa?9p8?}-uLGBryq=vU*yq3CZ`x`h5`g=MnVcK zWMF~)m4p_zfZb7wnFa9&4|s}PtdHga#5xW{R_A4!sClAp658f)Sr`+HGYqvt(PTv% zG+3hXJ=@TRt{8>|bV|TVDcJXPLty|zaKMEp;K3e@ULgKgyz zkZ){C8g_@xb@ff#;Ij+aw&ByzRo7`L#jP^VnWzdaYo8h?5m}WN%Iuws45CGq=Ukfc zBF%2N{D<$QDAs(3qmM$zSx;;Ccy^f<8ml^s9(EQx>@9liEjn5|$FuV|=gN57Cbsrw z)c4R+U*FMS`*~=e${!k5Lg-2!Lxe*&L&*y?lkL!r4QZl{wN6XlGIkm3E8N0&3Z1-; zvQ+7xM83p>e?A0PBIkih^D^Vhsuo3XDde>(8+>{FChD$> z`Z)%lt2BdoS)0TElLNd-c_@VL+b`&h&X}Ac`L-FBaRITC2Z-`{D{W%i+aq~}d&Yg2 S3#c-F(*B_uqPWziuJ;$~N6;() literal 1447 zcmbtS%}(1u5Z+xowi6OcDJ9T9<$#cKiAZv(Duh~6iBq`*3CRtLjK>9o|5!WFM9vA+ z8;9O|uGDkiqL1KfPrL%B&e{$T!KK31?0&N|^Uciev@4Yo`TgnhPlb@b8Hy2}oYN|~jX&Ak%{WR^ z90lYkq#Vi=hXOMXaD2--%2OOFa;PbXHpQVqu0*}hjhw7A8^&DN=|g~xWl{j)GpJO03n z_;9Dr64gXs*9&#k_5#N+t(%7sPbZ^v#Y4Qo<$%OwZ!vuUe9ChQ^q6rurr+6#j3qFg ztu^yxiTuU(0O?s{EurQw!c`==e%pE1+v3*nL*%c}#q-pN|C&n?ez zt$toqZ+~Dr&_HFoYeHv%KSY2@cg3e;)2BFRQ=@q zlvMrvoXXsS%;fljqWrAX DT#F`1 delta 76 zcmaFMc$JaUn3tE!Db6Q4W+G>~xudgHjC)aPrDI8cZcKhoWo|)ca&de?QGQlxa!E{~ ffnj`6YF=V)YJ75jPHAplaZE{SaY=E^#Pf0h>kAx0 diff --git a/q01_rename_columns/tests/__pycache__/test.cpython-36.pyc b/q01_rename_columns/tests/__pycache__/test.cpython-36.pyc index bd0596ec1b87ce3ca7c3e59afc652c310a9b6de8..2439247b9bafa7209a637d27fbc9e5e4358f770d 100644 GIT binary patch delta 665 zcmZvY%WKs@6vk(gNiz5S>TP?4D+*N%w#K5%DvF@HZmbCDBE+1bH=36-3ARNkSQl;- zW%e$`y-WWES1z*^1ebyj7k7F}{<`Na@|1ZZPK$)?RR?+I-Ou?WQG^lm zq8yl)CkJT}M?t~!hb$_Cj6LxlU)~Hj%fgfeQJz$3CcIL$7M|QS&*PbVZhjkfbSK^8 z5BhSSY~ZIWum)IIGS=4~X#LHTlNe zlmq)U9?5sMJ3Xm%U2Zt*culsP{iA`Z;uDP(jnf)`JvOSZbGE{&+JY)jOo;M1& delta 754 zcmZvay^GX97{)U*`P$uNFS~np?)k+bcwA5p<*Z~C<%+X8L9~j25c3XqS@Pvf7G0Yy z)=n&rw3ZguT3T3(o#k{Q2>t^WV&P0I6ui9Tmxr0*nRlMdd++67vFp0sFK-VXZkn3* zRr}}hq`oCz{#pXGKm!CgLjh{PIKUK5$yBFU(r9T)T1#z-R3WvVWOm*OI<3~TZr%%e ztu`_zcLP`I17+F|`d|ix_9$7RUB zT!S&~EJ-i`d|&f7j$cjOyFL>31Ip{YnA79$+nr~loe<(W4&R+YZ;+|W<1o^E#Fr+H zls|9mT@Uveo!_p@JS?+$UZn|-DppQuQiqSPT#Xnl;+#fFna%Qohqd(PVRMIUq4P~i zzO8kYqw@L#S1PgH+#?$vqxFmxQCjdiE)sg7Y4p$6Mr!4%gin~Qv`ShS{3x!dkJw3W z7nNJ{%W%+E^TGIpyyk`JpSbVkcIB=$LVokZe7fkX4TcKq3g;C5w%RJyFEb?6Bv&2T z$kt_%cGMpVD~g~@qDT-v=K_~p=v7=F2{W!LT7b}}Wm*UeQl^3u<{_<}7WGVH8Us=t#O7xpACVV2RG^8RZ4w1kd5 Tyh$9Ss&DH$wy`{rEC>Gv4^gag From 731a17554d9d59a98741f6a9bfbdd547fdbf86f2 Mon Sep 17 00:00:00 2001 From: simpleguyon Date: Tue, 20 Nov 2018 18:06:46 +0000 Subject: [PATCH 2/5] Done --- .../__pycache__/__init__.cpython-36.pyc | Bin 211 -> 235 bytes .../__pycache__/build.cpython-36.pyc | Bin 601 -> 666 bytes q02_country_operations/build.py | 16 ++++++++++++++-- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 217 -> 241 bytes .../tests/__pycache__/test.cpython-36.pyc | Bin 2064 -> 1892 bytes 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/q02_country_operations/__pycache__/__init__.cpython-36.pyc b/q02_country_operations/__pycache__/__init__.cpython-36.pyc index 005bbe0f59e7251da0293086d4e318989a629efb..7dd54c62d7874e51d7d21ac2200c32cc011276f7 100644 GIT binary patch delta 107 zcmcc2_?nT^n3tEUwdP}V=tRzPvvB>4{M=Oi;>_HFoYeHv%KSY2@cg3e;)2BFRQ=@q zlvMrvoXXsS%;fljqWrAX~slBsRjC)aPrDI8cZcKhoWo|)ca&de?QGQlxa!E{~ dfl+*NeraAwQDuC7L26NANoIatam>WCasafK8;Jk_ diff --git a/q02_country_operations/__pycache__/build.cpython-36.pyc b/q02_country_operations/__pycache__/build.cpython-36.pyc index 65c7fed965349a7b6e0dde2e9e236d662710c2f7..e22efb69136adf7ad48e2afd64e832afc0cce0ee 100644 GIT binary patch literal 666 zcmZuuF>Bl~6xNgN#5r3iSz>Ajs!C&`DupML`(w`6Tmtlwj}eN3EikVHWa zKse2*06}}m10L}3hUB3LMbP`R=!_&Ae-J?u7+zc*ye_P$nG!{*Wvgnp+DS9c8kT9< zDN~g$E#21=xyR-A0OJtDy~K2lyu0KQIeBnHdcf~+j(?FQI>|Q=bz3*KdxAgn_}Pd@ zEcC!Bb^))prz7?b_N-_7=WYJ_F_44~ku$PthD|GsWTij@@ck#TTX^H{V|JmH$Xun2 z6z6TH>+F-ZU!1{S6ouz6O^hx6P)Y@bf|~}xjXNntt>{MU!krx{u`_5&>V(OJk|Gq$6O``U zxpd`2_!Q0)_yTUaa*{3-H-|ar-tXLbu|A1=P^q|I@0Yz-JabRb4W4x`rW6411Q^@` zLokF4WiWTG-wZL#NQVBUm{}P#1YxCuunWR2TC6Omi{u)3&ZIt;f#Qu+B(f2UFj0Yc zY&>wuwcVMDJWp0=uSv&y9=+9I0h7Ur}_i^lW(&C diff --git a/q02_country_operations/build.py b/q02_country_operations/build.py index d4c641d..9b1af6e 100644 --- a/q02_country_operations/build.py +++ b/q02_country_operations/build.py @@ -1,8 +1,20 @@ +# %load q02_country_operations/build.py # default imports from greyatomlib.olympics_project_new.q01_rename_columns.build import q01_rename_columns #Previous Functions -path = "./data/olympics.csv" -OlympicsDF=q01_rename_columns(path) +path = './data/olympics.csv' +OlympicsDF=q01_rename_columns(path) + +def q02_country_operations(OlympicsDF): + OlympicsDF['Country names']=OlympicsDF['Country'].apply(lambda x : (x.split('(')[0]).replace(u'\xa0',u'')) + return OlympicsDF + + +q02_country_operations(OlympicsDF) + + + + diff --git a/q02_country_operations/tests/__pycache__/__init__.cpython-36.pyc b/q02_country_operations/tests/__pycache__/__init__.cpython-36.pyc index 3d1192a9867441c1f827f7aa1263815e68fdf5df..989d8e79498b86269ca86b70b8063d0acae5c1f2 100644 GIT binary patch delta 86 zcmcb~_>qy*n3tEUwdP}V=tRzPvsnF%{M=Oi;>_HFoYeHv%KSY2@cg3e;)2BFRQ=@q qlvMrvoXXsS%;fljqWrAXKq^q-4jC)aPrDI8cZcKhoWo|)ca&de?QGQlxa!E{~ zfl+*NeraAwQDuC7L26NANoIataZE{SaY=DZe0*kJW=VX!UP0w84x8Nkl+v73J2nOe JhGHOQ0013zC3FA) diff --git a/q02_country_operations/tests/__pycache__/test.cpython-36.pyc b/q02_country_operations/tests/__pycache__/test.cpython-36.pyc index 1d77332557bc4d037b01e191f8a569b60739c4e3..c5e2810de9fcd7249e20c2ab6406aaa8c31c681d 100644 GIT binary patch delta 679 zcmZ`%O^ekq6iwRnbKZONnCCqF1ZOdWMKp+l3qKf8bRnpVfx#%0+5}%UeJx3=%peRh zx>vGurGLVe|3PrsohX9f#;q%FI*S=ZTXJ&lO>^$aO<#|{jdsothw-cDzwUPgp|9w` z12I~Mp&tNn#1O~ak+^i2gAsQ*k#0#CDLv*vjJYTMGGIZ^eHpTl2P_hvh;}iH1ragK z3pWuDdGr$TNI1JL8*uEu`MAEE;4a({y1ABV@xy_7iPKHZCueHz;pChqs~z=~VhJy@=Gw-|)w~j!pjshf(+UE!K87X9y|3`ko+E1Tm zvK9K2dGBxTjIG`w3x_Qnv#@`fo-Nv30B{_J4go?O5_sJ{n+&@kO?j24X&1KhqOmoU zHQsp-+d^_>e+=c>L{Q9i4GmTOl}r%YKpm;GX2#+>do9=3Z}e^IrT^um3on-yZ>6|u THMI3l;sGAx0hl5fths*x4=a#6 delta 860 zcmaKq-D(su6vro-+1Z)yN4Kq2TNPGNaINl&y<1eatXRaVH;ND!hIA6ztn+0ut88y7 z)CaK4jSu0aPv8?+FLNh~FW{Yc;mK5Jk>Z5>@+Wi7NzOU>-h9{EU2QaGKB|r9pDLF1 z%{ulupa(G3djPYD#Sp_0BB)$3!5oe4vBNR2Qql!h_pCi+2C@$SGuvqJaUw7FiC^kU zG!xfIEv}Q>^>V|F8gY{}OO2yhGRvyO=5-Fvq{VBz1?$|p#XRP}wV2QSJ)6uky#Hp< zf3&kQ?Dw83E>$l{sF1yfA`xMlFuK~?5Su+Ea(+Fd;S0LORR?MB30L`$D!zX(xU|z9 z_DAcIPuKD^9;MMV&P1q!Or~QV<|9UPIx5bguP&6wl6Had%KZk&Uu*yMdwJt#5T=tP zm(w84xTLvA6E(`=vewM{eLLGs@)#es7bb&B84&j)9X^^)<#@<<r?z7!l6K}!bjKQ+OQ39nhSx6VqhN(P&hdc*{UG8=kbTtTA8U}&3 z)l_MmD(z%6-_|b8GM+H)j8l>5DiboHG1u-E&%@VDdy`~WJ34P%XCD9U``vqGEz6sol!*3j#VMOa{Eo>;EuRKDeharz9Yzb+ KAvFg Date: Tue, 20 Nov 2018 18:09:42 +0000 Subject: [PATCH 3/5] Done --- .../__pycache__/__init__.cpython-36.pyc | Bin 205 -> 229 bytes q03_better_event/build.py | 15 +++++++++++- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 211 -> 235 bytes .../tests/__pycache__/test.cpython-36.pyc | Bin 2101 -> 1935 bytes .../__pycache__/__init__.cpython-36.pyc | Bin 204 -> 228 bytes .../__pycache__/build.cpython-36.pyc | Bin 820 -> 841 bytes q04_find_top_10/build.py | 23 +++++++++++++++++- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 210 -> 234 bytes .../tests/__pycache__/test.cpython-36.pyc | Bin 2941 -> 2776 bytes 9 files changed, 36 insertions(+), 2 deletions(-) diff --git a/q03_better_event/__pycache__/__init__.cpython-36.pyc b/q03_better_event/__pycache__/__init__.cpython-36.pyc index a1d4f1729b81f9a3a3dcb5b39d2f4f5901f28ecf..b8a350df3c119ac0747ad57bdd096a9ea768ee76 100644 GIT binary patch delta 92 zcmX@h_>_^;n3tEUwdP}V=tRzP_dxxO{M=Oi;>_HFoYeHv%KSY2@cg3e;)2BFRQ=@q vlvMrvoXXsS%;fljqWrAX~zNNEOjC)aPrDI8cZcKhoWo|)ca&de?QGQlxa!E{~ XfpL6NYDr0IQG9AyYFH zT0QRH!~R)LT|*b~pzM6?aUN$0)JW=bJX(;I79{=bqq7{7Tw#?1CK@(1pP-7wxFIMh avSwm-!71}P&hO>cOFQ=1EsQbw-~0fI7%a#D delta 74 zcmaFOc$tyYn3tE!Db6Q4W+G>~slBsRjC)aPrDI8cZcKhoWo|)ca&de?QGQlxa!E{~ dfpL6NYDr0IQG9AyYFWCasaXv8)*Ol diff --git a/q03_better_event/tests/__pycache__/test.cpython-36.pyc b/q03_better_event/tests/__pycache__/test.cpython-36.pyc index 2b9c3a26df7cdc034fcf99b9833185e9e21b3f19..3ae2fe34ba770765621f0ac87ffe61b1c8ea4001 100644 GIT binary patch delta 642 zcmZvZO=}b}7{`;DOeV9tL$|h73NF}-uofGk*CIs^-mGs>NDsqw^5Bl0H0~%}goBZECCS{J2$Flk%c-Eo!_v$AoC(%zngt?|z8C<7!5J1q z@L<@lWU<~tlF2Z5j${DNnJY$;zW%VgJjES*0J^>zYxwS%-0cl~Z*cp`$`+S#9rN}* z{z84@E7HDkHV>AJ{CS_x${e^(^D2Xf&Acr5eyNUh6(_)xQUWitd0wSSRH^b2Bz084 z34eTTJ355A1{J|E6g96+Ufpx6ns<}-t~8e&s+C` z!PHelt5*y+jje{9g$j+sRAWWN_U^(dP_^Gs3HQgqcgQsmW#d E7xDXxkN^Mx delta 809 zcmaKq&ubGw6vuaFHv1#lbhm9R{s4*A7D8zw#EVg+l0y-y2T_DEuxxgQcH{nXW>ZNo zImDwNWzXKcdJ->Qy!aP*9Pl85c<~?bYE2j}JB`$U=4Py^`#Ked;sZ4;EsY915+gR8=jabBfsS%sn zbA(q2JbAU-e{j4t=yxA;%6K&E7lvjQ5bApa+W?blbP#g*)$a9(! zp^vjD6()&T8YEO02eb%Z5MfQyStPr~3kGFYymq>OJEKVy6Ncm>Q;(F%m#YagN_j4? viB*@gs{E=|RWWDPF09*0MkX=6qXM`(rw%>X1`cps(1H%IkPhUTkOlq#Q98kd diff --git a/q04_find_top_10/__pycache__/__init__.cpython-36.pyc b/q04_find_top_10/__pycache__/__init__.cpython-36.pyc index d8fba087f0dad22953e6837bd6b26d7bb14f7d80..77d389946c0cb4e45eeee71f56b153adca524598 100644 GIT binary patch delta 91 zcmX@Z_=J(un3tEUwdP}V=tRzPw*dW&{M=Oi;>_HFoYeHv%KSY2@cg3e;)2BFRQ=@q ulvMrvoXXsS%;fljqWrAX*N3ft|9aQ delta 67 zcmaFDc!rVFn3tE!Db6Q4W+G>~o`thjjC)aPrDI8cZcKhoWo|)ca&de?QGQlxa!E{~ Wfk}K?W?o8sNq#}Rp+U^VV{!oU`WM6i diff --git a/q04_find_top_10/__pycache__/build.cpython-36.pyc b/q04_find_top_10/__pycache__/build.cpython-36.pyc index 0068560a7391da46eaead3f3a6fe096ee2d9c5be..22d11a4c6eae3386b388bed9389bc6a40565cb47 100644 GIT binary patch literal 841 zcmZ8f&2H2%5cXfPX-R1X6;f|p_p;eiq+Sq0D&m0Da%iPW1}REo?>0*uXKim`(dM*p zB{SpnczaO_(U0ts9q zg*jG)6Gb`2ND$5>m28Q5Ac+jR8?SCb1^bG4C_@>DK!l>VWbh(7Mg5Iy$cOs0-I)## z(hKRFG^xCjm200&htJYn&njo;sjj8TT%jx5KAH~qQzNTPNpP1lRoO3(2Z_jBmgsV> z>LRy;++O9(r-row$MZjeV}F8JbQOFfd#FL<^&YVgtYJ;igiUXOCQ#1;FG<7Jm;ese zm;w$Rc4WZ>-9t+}p^LzyMcCt3@LQod{2^e*m}ZO%Oaj zTGxF7Ri5=RXTs>ZAGA?bW@ap{Ygt)BD@-rFK@iF(?0n1;mcEs&~J2a*>FFCQ+xtoh~WgK z*vF~mTPg7gM$GalC!8*^Z*z;=wZ$vT2%|rc?{J6P%w`U2Eonggmhbvoew(=`sK0d! zc~PI}-I+HI&$v=thWwgmN%OlGjAA5o<%8#a8jmOakD=N zSfrvrB=a#IAvAP2|(z>k?|a3Ay=!Sm0dYi>zsmWdh__3j1}+AMJam)h%nN6 zmt1n)nXDxrgFx+^3Kb>AZ5y5qU7|@`DD7rRBriDJNWoR#)zpaBbRv>rjiVaJO|JLw z)o{ZbZFpntOhlTB>?e}@Q0dR}$&28f!0U)w#QQReW=ZPgB0;@Zd@6|Mq)TM5JT+hIpx2qc4ry?JE>k=#HUj>Lr^T1m6J?NT*?#ooLGU2Z< Pctr=Giz#-^Choys2K3@Y diff --git a/q04_find_top_10/build.py b/q04_find_top_10/build.py index 9f283b7..2c9acc3 100644 --- a/q04_find_top_10/build.py +++ b/q04_find_top_10/build.py @@ -1,8 +1,29 @@ +# %load q04_find_top_10/build.py # default imports from greyatomlib.olympics_project_new.q03_better_event.build import q03_better_event,q02_country_operations, q01_rename_columns -path = "./data/olympics.csv" +path = './data/olympics.csv' OlympicsDF=q01_rename_columns(path) OlympicsDF=q02_country_operations(OlympicsDF) OlympicsDF=q03_better_event(OlympicsDF) +def q04_find_top_10(df ,Sum,Win,Total): + df=df[:146] + list_Sum, list_Win, list_T, Common = [] , [] ,[] , [] + list_Sum = df.nlargest(10,Sum) + + list_Win = df.nlargest(10,Win) + list_T = df.nlargest(10,Total) + com = list(set(list_Sum['Country_Name']).intersection(list_Win['Country_Name'],list_T['Country_Name'])) + + #Common_L =set(Common).intersection(list_T) + + return (list_Sum['Country_Name'].reset_index(drop=True)),(list_Win['Country_Name'].reset_index(drop=True)),(list_T['Country_Name'].reset_index(drop=True)),com + +q04_find_top_10(OlympicsDF,'Total_Summer','Total_Winter','Total') + + + + + + diff --git a/q04_find_top_10/tests/__pycache__/__init__.cpython-36.pyc b/q04_find_top_10/tests/__pycache__/__init__.cpython-36.pyc index b6dea627522f063d4b856f09e4fd454850209db8..16da6f0745d2ed4a21a6d629c7f8a559f823044d 100644 GIT binary patch delta 124 zcmcb__==I!n3tEUwdP}V=tR!)tT6qI{M=Oi;>_HFoYeHv%KSY2@cg3e;)2BFRQ=@q zlvMrvoXXsS%;fljqWrAX~iJh}mjC)aPrDI8cZcKhoWo|)ca&de?QGQlxa!E{~ cfk}K?W?o8sNq#}Rp+QVZYH>+%%)~Qt0FSX6aR2}S diff --git a/q04_find_top_10/tests/__pycache__/test.cpython-36.pyc b/q04_find_top_10/tests/__pycache__/test.cpython-36.pyc index f2adc9ccc36241f12ad7a4ad0716b044189dc8f9..422e0efb0cbfbcc2e31228126ff5541910e4628e 100644 GIT binary patch delta 836 zcmZvZ-)q!B5XX0On;(};e_Y%9(b}_WQ7mfHs;H=FrJz(ruoQ$<3}GTX z7Y#zbkiR}t`g3w8A0&Wq0u&UV1`1awfdVkU5HQXHm8*fqwLs^(j8jm3BPjA>*VlZL zo1pWO&_!v3a!Y8!>RR=etuSGM0Yxx3*bT<}ct0QDgU{aAM$1rv5>#OTET};p$}kFJ zEt3yDr?rV;87|AT)na_)0)cU8JS5N%%0_`#K+BHNx$+dvjU|z!^UXwjQ)Cm_CUwm# z_lBo!Xr@j3^>O7L)nwZwX4zKZz|}$N{#dkE!a&%G7eu~jb=JbReJzadBvI29wi|-5 zLw_xZJlBch@V0PMr!DTlR8b;3SjGao|#Lk**A3c>lW?u*UQ3eIJQO+Ky zhv?btmHN3i^-^ol`RtAMLaX6{dUjKv=&gFHH|Tj;bujy=ukPQjl;yd)6h^Z%c|n>f z8u#c%#u#15o*0|IFF#kDoc^~8@2O)C4lFxv7zAP4@jdyAvCCc2x5X3dL-@QZVh3U; zVmD$h;!n3-uZ*#x#7VgmOTwTAldFKMo0+QSy5m6TI!f@;f!KwZMBvl@_vYL<9fZ*F U#Th9{l0^xoShP;9>~QJQPx+&^oB#j- delta 1060 zcmaKqTWi!n6vs13Hk-|E_S(Jlvf5%1N-x_|p}L4xTB%^I3Ke8ri0Pi`nl-m(QcCy1 zK5QR-DfuYA_~^%wJSzAVgo5Bq+N!k04EfE;{O9~@;ILeid}GuxR}JEUBV?uV~OMmGr?t|lXBAM&igDWg9;hYhH^*7 z6+D8gxCU9sfev{nKoLq%h6;@IG+c)&Q)+B92X$yLWfaDG+Fjf@Pbjbyo=|~tF5po% zwZyfajK?+vn1JT708Nq^N_ZT^lhf7q)?jw6-FihyKwGYBT0!fXw71XA=tn!Q(G;c5H7iF=E8j9tqGBlLV@X|WTsMQJBGm2RWeXiEN3)VUou zIzut4r{>Xm^f>kHs9dQUG>6_7xTw!izQQ$K|q7~$W$hy7wYlF z&SLe})jIS{6TM_RfTI%23aT7q98Hc%j%kj+za@!^d`x9{$X=RbP?0LLCh?XiGZS&z zFu>~?Ml8`o8jBu{W#0_n#fs_s#D!SydzKrg!3tc{aY(H6NZ37qSlxH6kQW&6T5$E! z$t~>cTQ&p|(*l_z#i207Y0ITPyCp$#HAeV&g`>eS&T)fdDr#ws6~6!L3X9eIjtBcT XdB8pCYX(^?ijyeET0@LJYMZ|SNGJOJ From ed290882774e60f50b1772e11d1c8928506e1cf1 Mon Sep 17 00:00:00 2001 From: simpleguyon Date: Tue, 20 Nov 2018 18:11:33 +0000 Subject: [PATCH 4/5] Done --- .../__pycache__/__init__.cpython-36.pyc | Bin 208 -> 232 bytes .../__pycache__/build.cpython-36.pyc | Bin 582 -> 967 bytes q05_top_10_plotting/build.py | 26 +++++++++++++++++- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 214 -> 238 bytes .../tests/__pycache__/test.cpython-36.pyc | Bin 1304 -> 3655 bytes 5 files changed, 25 insertions(+), 1 deletion(-) diff --git a/q05_top_10_plotting/__pycache__/__init__.cpython-36.pyc b/q05_top_10_plotting/__pycache__/__init__.cpython-36.pyc index 36afe446e05829cdf643a9a89d82b42d08b00b42..7178fd0d6538e647f299f9a3dc7c7d246364f1eb 100644 GIT binary patch delta 122 zcmcb>_=1tsn3tEUwdP}V=tR!)j1c{d{M=Oi;>_HFoYeHv%KSY2@cg3e;)2BFRQ=@q zlvMrvoXXsS%;fljqWrAX~k&UxejC)aPrDI8cZcKhoWo|)ca&de?QGQlxa!E{~ afoXh6enGsUL3}|@eo0AYUV6;LQ*r=VQ5mTK diff --git a/q05_top_10_plotting/__pycache__/build.cpython-36.pyc b/q05_top_10_plotting/__pycache__/build.cpython-36.pyc index f75beb57f8f69c2384185733dbed2236b29d41c2..c71f24e5a62c9d9af64be18412bb5375902365db 100644 GIT binary patch literal 967 zcmZuwO>fgM7>*MsP1CP^NMrC1dTCk)oDf19;)I6KCQUL(RvMcwC5}_a-By&I%Aesc z`O0Z`PMmn1wPFGs`FZU;PyBxP%}K8py*vB)v5y_+hx1_guzn4*x&>ekL%B0Y#D$fc zdjblhWZniLhhfs@E#BTB67hgXjrF${^N9H@V66@Qgh_{VNsshd z$lBi=GT;Lq@ec3u-Uh=t=-e4bci`PQ8)7q9jGxiZS;455C7q1T-eP=0r(A2UD8J@~ zHb;x`Q<}DW+mDi|Rb&GkR3Tt=WZd762exSmQDyk!fLDi|fb+=J<>yA}12dd!$=+}N%l6BiWnNAZN@mn7!I z2bbpNrWQp_R$vri(&V4~nn{}V7IQ&P$z*P3pZZ&T#pRhL$rTD;-Pnb7S%$hQ${Y9W=B39Z mm1gFo=oM7n;;_lhPbtkwwPOPLjSon0F-kCUF|sgnfFS^zuTi1^ diff --git a/q05_top_10_plotting/build.py b/q05_top_10_plotting/build.py index 78064cc..47081d9 100644 --- a/q05_top_10_plotting/build.py +++ b/q05_top_10_plotting/build.py @@ -1,14 +1,38 @@ +# %load q05_top_10_plotting/build.py # default imports import matplotlib.pyplot as plt from greyatomlib.olympics_project_new.q04_find_top_10.build import q04_find_top_10, q03_better_event, q02_country_operations, q01_rename_columns plt.switch_backend('agg') -path = "./data/olympics.csv" +path = './data/olympics.csv' OlympicsDF=q01_rename_columns(path) OlympicsDF=q02_country_operations(OlympicsDF) OlympicsDF=q03_better_event(OlympicsDF) Top10Summer,Top10Winter, Top10, Common =q04_find_top_10(OlympicsDF,'Total_Summer', 'Total_Winter','Total') +def q05_top_10_plotting(OlympicsDF,Top10Summer,Top10Winter, Top10): + + list_Sum = OlympicsDF.nlargest(10,['Total_Summer']) + y=list_Sum['Total_Summer'] + x=Top10Summer + plt.bar(x,y) + + list_Win = OlympicsDF.nlargest(10,['Total_Winter']) + a=list_Win['Total_Winter'] + b=Top10Winter + plt.bar(a,b) + + list_T = OlympicsDF.nlargest(10,['Total']) + y_1=list_T['Total'] + x_1=Top10 + plt.bar(x_1,y_1) + + return + +q05_top_10_plotting(OlympicsDF,Top10Summer,Top10Winter, Top10) + + + diff --git a/q05_top_10_plotting/tests/__pycache__/__init__.cpython-36.pyc b/q05_top_10_plotting/tests/__pycache__/__init__.cpython-36.pyc index 3fdeb4e88052d6508cb40bf730fcd20a10bb2b45..b602b7175a7e90adc31a7a4a24c3edb927fee480 100644 GIT binary patch delta 101 zcmcb{_>Pg&n3tEUwdP}V=tR!)fGGWp{M=Oi;>_HFoYeHv%KSY2@cg3e;)2BFRQ=@q zlvMrvoXXsS%;fljqWrAX~g_E;YjC)aPrDI8cZcKhoWo|)ca&de?QGQlxa!E{~ gfoXh6enGsUL3}|@eo0AYUV2PPYH>+%%)|?F00FKXRsaA1 diff --git a/q05_top_10_plotting/tests/__pycache__/test.cpython-36.pyc b/q05_top_10_plotting/tests/__pycache__/test.cpython-36.pyc index ddca5ec511b2af55a419dd233ce5e0c3f2b9e1ab..4015919b8b97de1b1b6103a98cd7a9fa3ff879f1 100644 GIT binary patch literal 3655 zcmc(iTW=dh6vy{!uWw13v~B~f*n$c*YGb=0Kr4hQ(oz+PJkW?rOQq4)Gl?DcmYLa< zSVclg`38ImUid)s%99^?<%x5~iJRbclUAVG+B37B+nL{<|LpNUZH1zk#7fU{I4E{FZs5kHpcI#ba_j|OTnQ@BX3|nr zjcY*->gAx$Dy)8B1`X!1hAzv8Wr;PYM=P{?;5>1HxnMq62+lE=HP{@RXA1|8X*@7! zjn-cnw9f1UJ6NRFBcs(Au2t7L3nim|n)u(s^-Ui6-B11QXLmZc@2qzGTb=Ib)#}|a zm;IFA@slJR@ahOQWNfrd$+-pOCFV zLJwQi!ft1kJY`ZcPS_qxq-ySVZjoM^Cz9`zG-EuJgESFpaktYYoF!q*pgGFpM8L9h z+e~idQ55oRk+I%zX{Aj=8Mf1CKh6d{vC)|$z zKDdFqaET{im;q182rPVJFO0yZHg%wcXGKd;y0lC^C`-s3%JP_P;L!%1gZm1drwdS4 z={dRxWsNS;^HA351)$zk7ZKZcETjY+CFnYkA#|%}!rJ&jXUcG`!zFHjk%lx6%pL1z z^SQBOOXoS

xz6*SD;uae(1uzykKh$bm7#tM`8bI{0t_R2~E8>!Rgfqc{8q1E3DI zmdhb(4UXNFgE&V>!Wk)P&S;`SC+EO;O|8DSe(D(1}+x;|VZ83zXflr|!=-ee(TA;6n zSv7}iGbpaSa*hdOWQ}ua#^<2|WP!4@c5G@+SXvvyuQvP4pP=MS<~;G`e#U&7GT|qw z^y5(W`u?+l?E4ZrZ)?2AdbS+3Fy{JDJWPZPlO9vG%{1$F#__32S(wmJsLDNvhOarq zd&}hW;Fab*Hj8kpmW2*zh!((vu8_gugqNZDC7tdpIy1+gMrOx?!wL?M!zgn%MpamG zgkBBr6)_V1@T`z@*OtYXVKV*>n3l~OSib;9x#Q+yAkC=_jn{>N0(E4V!<93$&_jzs zVDODY1VJntAifhYP)MUqFvT$T!YDsu#OSU7;|ffs%?TLJAWC~Pf@7M6p6dgc==E9X zp~Wozce!v};ZPytGn+S&#zinQ_P+c~pX~+0_z<^0IW}erW9InN7)%M{Wf&L7!Z<+B zbb5>Okcn$r;NFGrz#XR0X z8Q*#eGjS(V2BX&Kh1E z3onm_w;~DD`Ku&x;orN_idZ`q0XNUeL60nka6%B%?+I?hdZRzU{AXIg8TGVBTF@X~ zp@k_BI-YO82?#xMqt#FzAv#MZs!B+l(mY~>s5&8-NRC_h5;}@}IOZzcNAo@!d_nPR zXg)%79SxpT$C4jRJ2~bW9J3C583+tF&+;7j+VDk-bw~GTEvYggH0=?hRieB+8Nfdd zAvqp@%6*y-BC0cAj{nqn2@NLQ+{5-Vq*a(b>jYUjSt$F;qFXv4;rg&a%0X#8jpH=Y gOBQ*nyf4NuzQp+j`t6vWSvN0RbsKB=ZJKlTKR$HGZvX%Q delta 778 zcmaJfgc5cRGd+ez%SO~3d$R6-y{g{D>20~J)DsOo{jrA0`KCCkkY#lh<}yBneO zl0$mqgnWR%!H+;7Zd~`uzu?5$6e%Y>+Ba`B_Vb(3e!KO#HQf!v)~CzkSJ<(vU)J2y zF#NGO^1A_Q5sM;z12@c(*np4f zx_3=`aZLFzj Date: Tue, 20 Nov 2018 18:12:53 +0000 Subject: [PATCH 5/5] Done --- .../__pycache__/__init__.cpython-36.pyc | Bin 206 -> 230 bytes .../__pycache__/build.cpython-36.pyc | Bin 1003 -> 1403 bytes q06_golden_winner/build.py | 20 +++++++++++++++++- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 212 -> 236 bytes .../tests/__pycache__/test.cpython-36.pyc | Bin 2106 -> 1939 bytes 5 files changed, 19 insertions(+), 1 deletion(-) diff --git a/q06_golden_winner/__pycache__/__init__.cpython-36.pyc b/q06_golden_winner/__pycache__/__init__.cpython-36.pyc index 52aa4b0eae8dde0666cf0c4d9c8a4b6c0c06f9b2..9a4a93741a77c575af97570becedc75e4a868e14 100644 GIT binary patch delta 93 zcmX@d_>7U$n3tEUwdP}V=tRzPk0AYw{M=Oi;>_HFoYeHv%KSY2@cg3e;)2BFRQ=@q wlvMrvoXXsS%;fljqWrAX~ft9mWjC)aPrDI8cZcKhoWo|)ca&de?QGQlxa!E{~ YfmwWdeojhiUVM3GUS4WZ%)}FN04Z`AC;$Ke diff --git a/q06_golden_winner/__pycache__/build.cpython-36.pyc b/q06_golden_winner/__pycache__/build.cpython-36.pyc index 03a0fd046417789dda792d023911dc3296d92723..541e14c9ad7ae4ebd9e73c39088fd61811314a15 100644 GIT binary patch literal 1403 zcmb7EOHUgy5MJ*qn-}GwqEDZ4WOz(L~sU0rPjy2%_!lM zq7u`HmmuOQ<%LwM??1fIY#prnrpOLMJ~OO%{;bh8-?lBjiWf>>XO*n(wdx}cIN03xe0q5OuZ#x>ITPULQv?xGy z2a_~oopP#zoh;4=EZ$wwM?$eKUOzJL>|{KNGr5bCx%GZXXg!t*6f7-uW8GcIj^ydHtuPg_q44!Iff?9kXm_kW12^~j9?MhSt7c3bhpKGT7aA_xbId?=fOYHF*PG}`3gsae$_&MbjmH`>XbGP7GK1>ebqeT0fX``~Mo$>s9GxoRR{_1Mu`Hv4@eiDR!p`~TP^E)`%7z9Ji zh>JqF;)GjsgW4Q(yV7Q@4Q?~c2(#v7NT@?y>d^+Xne!FVCU0_^ zJKW_SL@`~Vt8|UI$EfZ7hJL6`bZg?j2+pE}1-VRvuCLc8em^+ndCpb9FL{#d&57R& zMsk|uY8J?pt1ypblIe|!-whN`Lct*%Peqd5Jnjrxn1@3d&qNxHvd$>G)GH@4598o? zDg;;mtj|#bEwoj|M!-w8njkTp0i5g`hypewyM)0N#w$E#1IA-cjqx5}8iifBMdJ(upYF}p zm5Oq{HuZM?<&)(-!++AakDmmt(d^qu62Io+eC&5*eBwP(or%}v0=}bTRFXlnL z>(`UDFzyEnBJg!m2$@vfbZe1#&q`~NeD8o!P4BFVkR`EOzJvQlNH&f6TLY|Y4aAl~ L47b{w*xmgLsVf%B diff --git a/q06_golden_winner/build.py b/q06_golden_winner/build.py index 4789e29..8f96889 100644 --- a/q06_golden_winner/build.py +++ b/q06_golden_winner/build.py @@ -1,10 +1,28 @@ +# %load q06_golden_winner/build.py # default imports from greyatomlib.olympics_project_new.q04_find_top_10.build import q04_find_top_10, q03_better_event, q02_country_operations, q01_rename_columns -path = "./data/olympics.csv" +path = './data/olympics.csv' OlympicsDF=q01_rename_columns(path) OlympicsDF=q02_country_operations(OlympicsDF) OlympicsDF=q03_better_event(OlympicsDF) Top10Summer,Top10Winter, Top10, Common =q04_find_top_10(OlympicsDF,'Total_Summer', 'Total_Winter','Total') +def q06_golden_winner(df, Sum, Win, Tot): + Gold_Ratio= [] + + + list_Sum = df.nlargest(10,['Total_Summer']) + list_Win = df.nlargest(10,['Total_Winter']) + list_Tot = df.nlargest(10,['Total']) + Gold_Ratio_1=list(list_Sum.groupby(['Country_Name']).apply(lambda s: s.Gold_Summer/s.Total_Summer).sort_values(ascending = False).head(1).index[0]) + Gold_Ratio_2=list(list_Sum.groupby(['Country_Name']).apply(lambda s: s.Gold_Winter/s.Total_Winter).sort_values(ascending = False).head(1).index[0]) + Gold_Ratio_3=list(list_Sum.groupby(['Country_Name']).apply(lambda s: s.Gold_Total/s.Total).sort_values(ascending = False).head(1).index[0]) + + return Gold_Ratio_1[0],Gold_Ratio_2[0],Gold_Ratio_3[0] + +q06_golden_winner(OlympicsDF,Top10Summer,Top10Winter,Top10) + + + diff --git a/q06_golden_winner/tests/__pycache__/__init__.cpython-36.pyc b/q06_golden_winner/tests/__pycache__/__init__.cpython-36.pyc index 78c9f23eb0d21533bb93e5a02c8517e7323741c7..5a9ebeddbd05fc3437420744dbdc06ed413631b7 100644 GIT binary patch delta 99 zcmcb@_=b_wn3tEUwdP}V=tRzPzX<(|{M=Oi;>_HFoYeHv%KSY2@cg3e;)2BFRQ=@q zlvMrvoXXsS%;fljqWrAX~nS--cjC)aPrDI8cZcKhoWo|)ca&de?QGQlxa!E{~ efmwWdeojhiUVM3GUS4WZOi5~SNpZ}?b8-OAmK)Uo diff --git a/q06_golden_winner/tests/__pycache__/test.cpython-36.pyc b/q06_golden_winner/tests/__pycache__/test.cpython-36.pyc index 8c58d9e1004b53c3d1c738391053b0cf6571983f..b8586501a9c5b42426d1c1cdcd2194d9d576c9e8 100644 GIT binary patch delta 777 zcmaKq&ui2`6vs2kB$?gKc7JqR>n~6QVG$ZZP!A%NJ@nRtT_}t~h&zuqn#sgT)}LP^5B^(Q_!Vyu!s3=7!cK{_xlJtL2%0*Qaw=W!N{@Te=e}f|;TjQc+LCSF#@OQ> zV9;3-9)J%)GkV9P3xT-h3np4i`jGN2U*SF82MPgnVFh|P>+k^|^3`oiv_z`YLF{#-UigFSc@ZCn2RZ13Ybu$!k8HXP{n-Z^u)0$R&=i2T7!(Y?zKuHLT zMCK{%&kt1=?kWAG$m1D=GbJEY>7mS%S(Iz_7-nUZ!6JNm{bsbUQUO`CNU{ucSYq8G zte!bn$wu|g`7-IEdfnTdO9^@#Q}4%RqH3oo^_b|MabfEJ!O-OPjYL#58yfM8)qDE+ zSZ6QE$`d+z9e13ngSK!(qjL#$#?@DMLPphP@80dkSuj=kUt6civBp-Z@+;L_Z+f(9 zOrJ40YjED+-$9zloJO}1CaquyMwrVS<}|ZAMhJ?*C72arJj5U_E97AGpb?=nFif_KIP1LZo+Tug z99F!l%t!I0M^Ae31I*QL;lWrv5fpsj6#eU>YWm+*-E`i3-#Xo>*Q?)N?e2%BqI^+) z`3&^$;1Hh?OrZ)RObrPo<*ZT_$XFZepdyWuCeoTJQzDHh=Xs_{AJ^!i9aU(h^o_6@ z)o3kp=&2LcX+3JtM%1LuGHHgbXok+9Z&3}JfC97)4QQ8h{m1M;o7t?ws#D$7=`8Kg zIXVwDXu~XYU=E`i?a~FhxTCNdb6zOSfyz{)OH6&F^y(*@)gcEzd-LJO)`OF^;a2~# z051A*><7GmKZt`-5;K3JzZ)F%MUcU@)E_ zYCrU|AmMWu?GgTW9o!!mlsZ>XrBLLnzB z`5EcviDBmZ=Gti+V|-p>L1IbbXLF?|JLDC_G7ce6)h4!KYqnNKdlw4J^H?(Syh0Pl zqEHi2=&7GQElfX6A!da>PJ+0wSioaHg2Ft6Y;?p5dlKIZGFc;+wbAZxcd&ji2|~s- z%yL~qz7md4N8uKtu!2~mc