From 4450c2f21145f275a6ec753b001c2533fd2e4742 Mon Sep 17 00:00:00 2001 From: SL345 Date: Wed, 30 May 2018 12:34:31 +0000 Subject: [PATCH 1/6] Done --- __pycache__/__init__.cpython-36.pyc | Bin 148 -> 138 bytes .../__pycache__/__init__.cpython-36.pyc | Bin 162 -> 152 bytes .../__pycache__/build.cpython-36.pyc | Bin 397 -> 439 bytes q01_load_data/build.py | 5 ++++- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 168 -> 158 bytes .../tests/__pycache__/test.cpython-36.pyc | Bin 1529 -> 1525 bytes 6 files changed, 4 insertions(+), 1 deletion(-) diff --git a/__pycache__/__init__.cpython-36.pyc b/__pycache__/__init__.cpython-36.pyc index 91557cd05bf4f07dc1526cbb9ff684bfca7460c3..91bfb4072441b9d6462d956268ae451b10af5276 100644 GIT binary patch delta 47 zcmbQj*u}_U%*)I5bvj@4L=JOlbN!6`+*JKwA7c|!{qX#v?BasN{YEiL%Vp2wCaYkx(acNRfVs2tyW@4UxUTS%K MT4qja@x&+t016Bf)Bpeg diff --git a/q01_load_data/__pycache__/__init__.cpython-36.pyc b/q01_load_data/__pycache__/__init__.cpython-36.pyc index 5e9e2e2740ce75441ea56a2372f1c0fc7b50e02f..18b0542fb943d18c31b3a49f74144490dd52e5d9 100644 GIT binary patch delta 47 zcmZ3)ID?VHn3tF9>vX>8i5%wAuKF4IxvBcWKE@`d`r-LS*~JBk$*KCu`6;OrQ|tgo CvJTz= delta 57 zcmbQixQLO%n3tE!)hZ%tB8R!EzkXaky)IPnq6F)RFs&Tn3tKDr=OQv9-o$(lUh8Ph0$Dw z4P+z`GZcYXn(VjO3KH{D5{qv!6{Jj#Vbn4N2_sB~uvmd&w>WHa^HWN5Qtd!4D+Vd! KVB}!rVFm#2H7ck8 diff --git a/q01_load_data/build.py b/q01_load_data/build.py index 1a26cc1..ce19b4b 100644 --- a/q01_load_data/build.py +++ b/q01_load_data/build.py @@ -1,10 +1,13 @@ +# %load q01_load_data/build.py import pandas as pd import numpy as np from sklearn.model_selection import train_test_split def q01_load_data(path): - "write your solution here" + 'write your solution here' # use .read_csv function to read the # data and header=0 to skip the first row + df = pd.read_csv(path, skiprows = [0]) + return df diff --git a/q01_load_data/tests/__pycache__/__init__.cpython-36.pyc b/q01_load_data/tests/__pycache__/__init__.cpython-36.pyc index 46496ca72cf628223c8e5f0e036e3f379bb90b43..6a3ddc20ab56a314465862a2122129a63139cf03 100644 GIT binary patch delta 47 zcmZ3%IFFITn3tF9+jPF@i5%wA-ufB&xvBcWKE@`d`r-LS*~JBk$*KCu`6;OrQ(OQ_ Cx(@dM delta 57 zcmbQoxPp00Yev!vFvP diff --git a/q01_load_data/tests/__pycache__/test.cpython-36.pyc b/q01_load_data/tests/__pycache__/test.cpython-36.pyc index 0dc2257e44c501d8fd20fa6bc7f191f1a715c12e..47efadc4bb1419bd6980a98c2f2d8f4f8186655e 100644 GIT binary patch delta 129 zcmey#{gs>3n3tF9+jPF@h>4s>IQY_2OVUbnayDL+Wt4W;&&bbB)erVDHZj!?&o9a@ zE=WvH)lbe(Nu4ar Zam-q-GbFCKV;- zCgx=(=IQ69mdB@M=A;%+=4J9>77pggfvi*c8RZyxz>tH9g^_~^0LE-2cK`qY From 7c370548ad9b525917ed167adcf167be727d64c0 Mon Sep 17 00:00:00 2001 From: SL345 Date: Wed, 30 May 2018 15:07:59 +0000 Subject: [PATCH 2/6] Done --- .../__pycache__/__init__.cpython-36.pyc | Bin 167 -> 157 bytes .../__pycache__/build.cpython-36.pyc | Bin 509 -> 639 bytes q02_rename_columns/build.py | 9 +++++++-- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 173 -> 163 bytes .../tests/__pycache__/test.cpython-36.pyc | Bin 1628 -> 1622 bytes 5 files changed, 7 insertions(+), 2 deletions(-) diff --git a/q02_rename_columns/__pycache__/__init__.cpython-36.pyc b/q02_rename_columns/__pycache__/__init__.cpython-36.pyc index 687491c04ee351a2a8984006b2759809a18bb255..59145a65ef8f9e0856cb853c555777a96083422e 100644 GIT binary patch delta 47 zcmZ3^IG2&bn3tF9>vX>8i5%wAUiumNxvBcWKE@`d`r-LS*~JBk$*KCu`6;OrQ=9=x C84mIQ delta 57 zcmbQsxSWy0n3tDJ+A1PyB8RzZh<<2sYEiL%Vp2wCaYkx(acNRfVs2tyW@4UxUTS%K MT4qja@x&-+0PZIfPXGV_ diff --git a/q02_rename_columns/__pycache__/build.cpython-36.pyc b/q02_rename_columns/__pycache__/build.cpython-36.pyc index 28092f56cbf20b2cf3ed76ec58daec0caa77a3c0..c041588e6a9379dabe8c86a19edaf5e537847b94 100644 GIT binary patch delta 326 zcmYjM!AiqG5Z&3P$r_VV)PsnJKu*``?v_m=7%CpTc`Nw} zPyT@)vY#S|ZieVioYiCy#1-dEX=^HTs_i(-AB?ic zN{X84?wKr;ytU0TQ8HCKgJ5ccMctc7ev=7CgR-@RSar-<+DTG1FG2Nwr%aTi2fM387x8f+WMYY|0paB~squkbJBj|hTj z>g4ba-pAc>pXR&a^gPc|gT=fBcjtPhgpiRvbgdNRNG@=K2&N>Uht5vRLil@CY9Ccv z7Epc~d7P}AJ{!E&W}#&gN@Fc-UJEK`A@ zO841TuCcm7->Y+24xR{Z{n3tF9>vX>8i5%wA0s0yFxvBcWKE@`d`r-LS*~JBk$*KCu`6;OrQ#=7o C`wt2L delta 57 zcmZ3?xR#N_n3tDpqi00aL=JP+DE-jl)S_bj#H5VO;*8Yn;?ks|#N5QZ%)~tXywvje Mw9K5;;)zk701&Md3;+NC diff --git a/q02_rename_columns/tests/__pycache__/test.cpython-36.pyc b/q02_rename_columns/tests/__pycache__/test.cpython-36.pyc index 1c28f5bca07d49cb3db1ed3590b30c6426cd37e6..ed6eba8414f85803337f4c848cbcce956eb0de14 100644 GIT binary patch delta 117 zcmcb^bB%}7n3tF9>vXNpIXRo97`qvzee^T(b5r$$eT+>^^~3Xv zvWp86lT-DR^HWkcpJHNSWQ^K;mbsRZO@x7gp-5tK0Bav()a3iDYQkbbfm>{4i8-aI R#YN&ES$3eT_+))HT>uDdAw&QG delta 114 zcmcb{bBBl1n3tF9L_|cC;zmwhMi#F0)RN6|jNOc?VfvxPsYS*5iAfom#TlvD#idC_ ziMfe+nTdJ&d8y^`X_+~x#hZ^XF)=dU+I*b3mXS@Afq|h&ahuABqsB+c>(|{#v~vB From f1e96ed137632254d11b2d44f01791612615e72c Mon Sep 17 00:00:00 2001 From: SL345 Date: Wed, 30 May 2018 17:22:21 +0000 Subject: [PATCH 3/6] Done --- .../__pycache__/__init__.cpython-36.pyc | Bin 166 -> 156 bytes .../__pycache__/build.cpython-36.pyc | Bin 522 -> 722 bytes q03_split_country/build.py | 10 ++++++++-- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 172 -> 162 bytes .../tests/__pycache__/test.cpython-36.pyc | Bin 1424 -> 1418 bytes 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/q03_split_country/__pycache__/__init__.cpython-36.pyc b/q03_split_country/__pycache__/__init__.cpython-36.pyc index e71d6ad8447b136dd4ced8957fb372b04928ae9b..374b3160cf5c0cf5590428101fc6e21ac213d758 100644 GIT binary patch delta 47 zcmZ3+IERtLn3tF9>vX>8i5%wAp86U2xvBcWKE@`d`r-LS*~JBk$*KCu`6;OrQ=9-v Co(}E+ delta 57 zcmbQkxQvm*n3tDJ-6|q#B8RzZuzqN9YEiL%Vp2wCaYkx(acNRfVs2tyW@4UxUTS%K MT4qja@x&-60PoHdR{#J2 diff --git a/q03_split_country/__pycache__/build.cpython-36.pyc b/q03_split_country/__pycache__/build.cpython-36.pyc index 5935601a743a778838cf0355c720e3720a4bcae6..d809521046a3be19c7f3e0b81e6d188a02366858 100644 GIT binary patch delta 442 zcmYk0K}*9h7>4tu?bg*zrzgGjXb&=Q3Lb`niYIRy2o;gCFS5?A2}z3En0VMt5D|Zc z|H9wkG2kER$#jT#$eZ^K&-cA~cE7x!+iC@$-|N>W^euRO@(3Yk_NdH?CJVBJM_2&D z4jIFkB1LCOSI$N6*VX=9{nt5`f-#`KL#o-H)v=3!4Gdl=RLR3N^lfgwI92YGs5Rey zkWZ;*;fxnDR6Hwm%JXo-R0pKRJUUi;Nvpn^d*k2OpZybbbI#i*n-t delta 249 zcmcb_+Qq_U%*)HAXA=`8$vBa#zn+PKfx#Jwi+O-V2}2D-Gh;1d3S%&XCR3F}c~NFb zszPOcX^}#4eokpgW`3SRMru*2pC)4wGf=%I(=C>Q#FC6#OetwA8H(6|Lcap^LyJ?3 ziuDtdGBS%ZQnQOolZp~^6Z0|?^Yrsl%j45Bb5e`-^K&Y53o?_7C*NSS)?x?Q4{`_t zQxOM{)a1OyR*;yNl309;sUYPRYhGz?LFFx`ynvX>8i5%wA{`wjDxvBcWKE@`d`r-LS*~JBk$*KCu`6;OrQ#=4n CfDZ-$ delta 57 zcmZ3)xQ3C#n3tDpgMUQSL=JP+Nd3^_)S_bj#H5VO;*8Yn;?ks|#N5QZ%)~tXywvje Mw9K5;;)zin01*BZ4FCWD diff --git a/q03_split_country/tests/__pycache__/test.cpython-36.pyc b/q03_split_country/tests/__pycache__/test.cpython-36.pyc index 51cbfae7c470758b6df9dd0e79f7b32a29cac8f3..1ce886406becd4e7ef589117ef2b4ae3e55b6649 100644 GIT binary patch delta 91 zcmbQh-Nnsm%*)I5bvj?P!9>op9DM1iC26HOIU8@uGD>^vXXNLm>IeH6o0#f{=NDxc t7bGU9>L=%?q;8gBVq|2Dnk>isl}&_!fuTrrvLwqQHenD`eDXn-^8f>`8nOTY delta 101 zcmeC;p1{p%%*)I5G&~|oV Date: Thu, 31 May 2018 03:58:19 +0000 Subject: [PATCH 4/6] Done --- .../__pycache__/__init__.cpython-36.pyc | Bin 182 -> 172 bytes .../__pycache__/build.cpython-36.pyc | Bin 552 -> 741 bytes q04_country_with_most_gold_medals/build.py | 8 ++++++-- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 188 -> 178 bytes .../tests/__pycache__/test.cpython-36.pyc | Bin 1149 -> 1143 bytes 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/q04_country_with_most_gold_medals/__pycache__/__init__.cpython-36.pyc b/q04_country_with_most_gold_medals/__pycache__/__init__.cpython-36.pyc index 5be5c53adf02229a22d02915aaee7b4c8c575db9..c396d98b441dc4d0011d3d256aaaa83580997a4f 100644 GIT binary patch delta 47 zcmdnSxQ3C#n3tF9>vX>8i5%wAk@^|=xvBcWKE@`d`r-LS*~JBk$*KCu`6;OrQ-T0d CP7f{s delta 57 zcmZ3(xQ&s+n3tE!%qk*kB8RzZvVLfBYEiL%Vp2wCaYkx(acNRfVs2tyW@4UxUTS%K MT4qja@x-Vg0Q@c!rT_o{ diff --git a/q04_country_with_most_gold_medals/__pycache__/build.cpython-36.pyc b/q04_country_with_most_gold_medals/__pycache__/build.cpython-36.pyc index edf8f759738d94511ce41859b8fad7e4c9472b89..d7d2bbfe89041dcf6ce56a1c11c75df0ac17d733 100644 GIT binary patch delta 434 zcmYk1Jx{|h5QhDcq)A&oBo?}L%|Zo*4Y43GAr>SMVW_N}OH&d%vK^qPh@oOc0!hW)=4Oxy;8(Vx zc$u?wi^tS@B{L&SV3<%CuD>C*=sbUpdLvoz-r;_KbE|hO)wwQN%6q8<{Qb`iV&ynZ+5Y*~O(vMTxnId6|iM z`gy74@oAYksl}7eFve@KgDe2q#K2U<0VFj!Z?P35=A|SS-(o6Axy71Snp;qLiz%<* q*5pX0NMn!^uoXxI$cS4UHo5sJr8%i~j6hy7NErts2O|$74>JJSel?Q- diff --git a/q04_country_with_most_gold_medals/build.py b/q04_country_with_most_gold_medals/build.py index 27251ef..e91236f 100644 --- a/q04_country_with_most_gold_medals/build.py +++ b/q04_country_with_most_gold_medals/build.py @@ -1,3 +1,4 @@ +# %load q04_country_with_most_gold_medals/build.py import pandas as pd import numpy as np from sklearn.model_selection import train_test_split @@ -5,7 +6,10 @@ def q04_country_with_most_gold_medals(path): - "write your solution here" + 'write your solution here' df = q03_summer_gold_medals(path) - + df1 = df.iloc[1:,[1,6,11]].astype(int).sum(axis = 1).sort_values(ascending = False).reset_index() + return df1['country name'][0].replace('\xa0','') + + diff --git a/q04_country_with_most_gold_medals/tests/__pycache__/__init__.cpython-36.pyc b/q04_country_with_most_gold_medals/tests/__pycache__/__init__.cpython-36.pyc index e7d7d49c71091cc917f786002893bbf142ce3298..f6e5ec9646d3c4f1eef6e1d5c60e57df161af873 100644 GIT binary patch delta 47 zcmdnPxQUU&n3tF9>vX>8i5%wA@%kD0xvBcWKE@`d`r-LS*~JBk$*KCu`6;OrQz8IV CFb_rm delta 57 zcmdnQxQCI$n3tDpLr_H2L=JP+O#RT})S_bj#H5VO;*8Yn;?ks|#N5QZ%)~tXywvje Mw9K5;;)zia02><=Pyhe` diff --git a/q04_country_with_most_gold_medals/tests/__pycache__/test.cpython-36.pyc b/q04_country_with_most_gold_medals/tests/__pycache__/test.cpython-36.pyc index b79dc6093878105c7d1c7b7ecb8bdb408988b933..643e7e05b1c6cf9326d84269717d1604616a4ad0 100644 GIT binary patch delta 69 zcmey%@tuRyn3tF9>vX>8^og7|IQY_2OVUbnayC8{Wt5KA&&bbB)erVDHZj!?&o9a@ ZE=WvH)lbe(N!={ZB+A4XHQAKK0{}z-7NP(E delta 75 zcmey)@t1?sn3tDJ-zz36ej?`$7OwQvl8rA#8C6sDLyJ?3iuDtdGBS%ZQnQOolZp~^ f6Z0|?^Yrsl%j45Bb5e^pOEQTvG2WW2&*A|9(6Slk From fa331cf5be354c49123e56004a4258d1beef2608 Mon Sep 17 00:00:00 2001 From: SL345 Date: Thu, 31 May 2018 04:32:13 +0000 Subject: [PATCH 5/6] Done --- .../__pycache__/__init__.cpython-36.pyc | Bin 177 -> 167 bytes .../__pycache__/build.cpython-36.pyc | Bin 523 -> 682 bytes q05_difference_in_gold_medal/build.py | 12 +++++++++--- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 183 -> 173 bytes .../tests/__pycache__/test.cpython-36.pyc | Bin 1104 -> 1098 bytes 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/q05_difference_in_gold_medal/__pycache__/__init__.cpython-36.pyc b/q05_difference_in_gold_medal/__pycache__/__init__.cpython-36.pyc index 20018489d9c8ca464bbd1f49bf6e96e6151897b4..62551f34df7919cb406715e830dde24d4dd09dde 100644 GIT binary patch delta 47 zcmdnUxSWy0n3tF9>vX>8i5%wAA^I8lxvBcWKE@`d`r-LS*~JBk$*KCu`6;OrQ+xqV C=MNeH delta 57 zcmZ3^xRH^=n3tE!%qk*kB8RzZoPKC=YEiL%Vp2wCaYkx(acNRfVs2tyW@4UxUTS%K MT4qja@x&-!0QoT!k^lez diff --git a/q05_difference_in_gold_medal/__pycache__/build.cpython-36.pyc b/q05_difference_in_gold_medal/__pycache__/build.cpython-36.pyc index ff681a3234f2f3eb61b3fc2c12f18f4741de08a2..cffb44e34775c038b4754b46c8f05fa6bb4b2fd8 100644 GIT binary patch delta 372 zcmYk1zfQw25XODZ-$pH6DH0NE7BUpJiiLrN1uBFT24rHFwluaCyHZ;f7$T-lB`Yrg z;x$-!1iwLFfe8l*sl)wr_v!AwyOsOlMcq~_`dYMazF{4$7)A(rHcoA*OAC#bsDwvY z!Wbx&07zq-I}}sr1ylDP2DpR9uJ+2h=U?}>^Rb8UNkc?<+_+3 zaFVkPSgXxzjrxL3V3E3KVnXAfaO$F=n7$ox%4WtPcPe#96OpApQF<2oV%*o5c;| zOTsBp21}ZHe45L-!Ca=*6YN7;y+N;AH~x8SVaIAF?B#+^C+wvDMuiq3gwTX0{skLC BT7Uom delta 212 zcmZ3*+Regc%*)I5*E%NZKf^?>ZgEBi1_lsz2I68CAd$it%%I6M@t2gf-%18e##<}} zi6t3DAQ>?6D_TFaIJKx)KQSpIvp6F)ySOx|C^0uNFEcSuKQFaBJ}omRwRrL@#!wA5 zkdZ*lP{a--G&ygv6(r`RBo^OdDoDA-npc`zPYt)5q3dX eAY*QE*yQG?l;)(`f!tcm0VFsWIT(2ud6)qIJv2A~ diff --git a/q05_difference_in_gold_medal/build.py b/q05_difference_in_gold_medal/build.py index 9fb11ec..658a782 100644 --- a/q05_difference_in_gold_medal/build.py +++ b/q05_difference_in_gold_medal/build.py @@ -1,9 +1,15 @@ +# %load q05_difference_in_gold_medal/build.py import pandas as pd import numpy as np from sklearn.model_selection import train_test_split from greyatomlib.olympics_project.q02_rename_columns.build import q02_rename_columns -def q05_difference_in_gold_medal(): - "write your solution here" - +def q05_difference_in_gold_medal(path): + 'write your solution here' + df = q02_rename_columns(path) + df.set_index('country name') + return abs(df.iloc[1:146,[2]].astype(int)-df.iloc[1:146,[7]].astype(int)).max()['Gold'] + + + diff --git a/q05_difference_in_gold_medal/tests/__pycache__/__init__.cpython-36.pyc b/q05_difference_in_gold_medal/tests/__pycache__/__init__.cpython-36.pyc index 7b04315b0b6d237579ec15cf32c7ddcca05a8b42..9ed5871c6d266b6a6ce3705e2c37bddff774aa23 100644 GIT binary patch delta 47 zcmdnaxR#N_n3tF9>vX>8i5%wAQTiGAxvBcWKE@`d`r-LS*~JBk$*KCu`6;OrQ-T3e C$qzCB delta 57 zcmZ3>xSf&1n3tDpLr_H2L=JP+6#dZR)S_bj#H5VO;*8Yn;?ks|#N5QZ%)~tXywvje Mw9K5;;)zkg02m$=JOBUy diff --git a/q05_difference_in_gold_medal/tests/__pycache__/test.cpython-36.pyc b/q05_difference_in_gold_medal/tests/__pycache__/test.cpython-36.pyc index efd000f343fbaf7dec18ba47fe6085d26defc68a..dc814b3e0271bdca7977d6343f2418e5de051485 100644 GIT binary patch delta 91 zcmV-h0HpuW2+9ZvGYt(2^_LD?T#*UW2o7gubY^vIY_Z@K0UK5?Xm4$0FH=l2G&L_* xZ*psMaA9L*FJo_HWs@2LrUPkk1Czr7ya5rDfCGmLS_W`oZe(F|auAad1V4az9u)up delta 101 zcmV-r0Gj{G2+#-#GYt(2WlCIHRFMhO1PW(mbg|?W0VQBBRdZ!>b1z|HXlZk3WovVF zVsc?^VQy(*ZZB?ScVA{{Y-Mwk6auCL>5~AHy#l-e5|a=F7n6|#a0=Q6aA9s_VRLd3 HlM4ht?@c1( From 77e68b353d584d3b19097dbadd5b04cb0d12c818 Mon Sep 17 00:00:00 2001 From: SL345 Date: Thu, 31 May 2018 05:05:28 +0000 Subject: [PATCH 6/6] Done --- .../__pycache__/__init__.cpython-36.pyc | Bin 163 -> 153 bytes .../__pycache__/build.cpython-36.pyc | Bin 511 -> 776 bytes q06_get_points/build.py | 11 ++++++++++- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 169 -> 159 bytes .../tests/__pycache__/test.cpython-36.pyc | Bin 1468 -> 1462 bytes 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/q06_get_points/__pycache__/__init__.cpython-36.pyc b/q06_get_points/__pycache__/__init__.cpython-36.pyc index 7c1cf4d3fa194ea500060d626e777dd17dfe16e1..7f4e439fa2514d6f515c571926b7bf671a517140 100644 GIT binary patch delta 47 zcmZ3?IFpgXn3tF9>vX>8i5%wAZu%MdxvBcWKE@`d`r-LS*~JBk$*KCu`6;OrQ|tjq CEe_%U delta 57 zcmbQqxR{Z{n3tE!%qk*kB8RzZfPQFkYEiL%Vp2wCaYkx(acNRfVs2tyW@4UxUTS%K MT4qja@x&;50PxcjS^xk5 diff --git a/q06_get_points/__pycache__/build.cpython-36.pyc b/q06_get_points/__pycache__/build.cpython-36.pyc index d45fe38e1dfa35d316d77f85e60e28faa5563d06..543dd9c24b4bca38220d39e73c8a80193a6b6fd8 100644 GIT binary patch literal 776 zcmZvaL2uJA6vu7HNz>AfZA_{L2X07_P%>7AI7|p>S2Q8*fMgDl7rR|LC-Gtztth=P zIPyKB+5XgT?R|IqoAU!{~JF>bdSY3?1B=BFrei&du6$E1|>4fjaaZwg4=6U*)AWkzYGM zMsrnVEa1j2wQM~wwVqiNk>66y?L|w(6fS7`!r{P|d4U*t-}df9IMYj9~AcOryC{2ab#_%W{c zU>*(HK=V>?(-JM1UoHv=C#7a%bEzb+%eVk#l^Ur)Ft5tm)rcLo#_*qQPm)fIX|Y{VdfjZJLCCJ1qpop4L`_Kux9LPSZSg>B4J z_)6RQ0QNSzdsPPhpJDf#;h&G-uQeF56?q|V^p!R&d+x7{tRP+&wTZD%btMZOXJFtip{C{dgxPk< ztIRU7_#!57Pru{z0l{F(XPLwdmRQdW&$*Udry5q%MO!MsU6)fCMl@poYuQdS diff --git a/q06_get_points/build.py b/q06_get_points/build.py index 4f4afd7..8be59b1 100644 --- a/q06_get_points/build.py +++ b/q06_get_points/build.py @@ -1,9 +1,18 @@ +# %load q06_get_points/build.py import pandas as pd import numpy as np from sklearn.model_selection import train_test_split from greyatomlib.olympics_project.q02_rename_columns.build import q02_rename_columns -path = "data/olympics.csv" +path = 'data/olympics.csv' + +def q06_get_points(path): + df = q02_rename_columns(path) + df1 = df.iloc[:,[2,7,12]].astype(int).sum(axis=1)*[3] + df2 = df.iloc[:,[3,8,13]].astype(int).sum(axis=1)*[2] + df3 = df.iloc[:,[4,9,14]].astype(int).sum(axis=1) + df['Points']= ((df1+df2+df3)/2).astype(int) + return df['Points'] diff --git a/q06_get_points/tests/__pycache__/__init__.cpython-36.pyc b/q06_get_points/tests/__pycache__/__init__.cpython-36.pyc index 7db8f24d1cfbd68122874365ad040fdb7da11db9..f4065ec8c703a72ad1d63aaeaeb0bb7d18e474a5 100644 GIT binary patch delta 47 zcmZ3Tjn3tF9>vX>8i5%wAKKdE?xvBcWKE@`d`r-LS*~JBk$*KCu`6;OrQ(OT{ C4-WbO delta 57 zcmbQwxRQ~>n3tDpLr_H2L=JP+F#XWt)S_bj#H5VO;*8Yn;?ks|#N5QZ%)~tXywvje Mw9K5;;)zkN01vvX*-Bp!CZykeI<_U&f_OFBvC)VT@M|(hn_8Eh^Se zOv=bC&PdHJE=?**%uUS8Ow7~IOD&I2%gjkFo}9<@iSgFvMCKeuV`-ofMe-m*1eFj4 sae0A+01y|m0SOL94i*mPBHl@?xdO5vSve2^Qc@%`Igmwo@&r~j02op=3IG5A