From 7b218777d89a485cc0422dd46ab95411310867f2 Mon Sep 17 00:00:00 2001 From: rushi0109 Date: Sat, 5 May 2018 04:25:15 +0000 Subject: [PATCH 1/7] Done --- __pycache__/__init__.cpython-36.pyc | Bin 148 -> 142 bytes .../__pycache__/__init__.cpython-36.pyc | Bin 167 -> 161 bytes .../__pycache__/build.cpython-36.pyc | Bin 509 -> 735 bytes q02_rename_columns/build.py | 22 ++++++++++++++++-- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 173 -> 167 bytes .../tests/__pycache__/test.cpython-36.pyc | Bin 1628 -> 1626 bytes 6 files changed, 20 insertions(+), 2 deletions(-) diff --git a/__pycache__/__init__.cpython-36.pyc b/__pycache__/__init__.cpython-36.pyc index 91557cd05bf4f07dc1526cbb9ff684bfca7460c3..25da6cb4141f42647a99fa36d814888e5edd8f89 100644 GIT binary patch delta 50 zcmbQj*vH6j%*)I5+wko~b_;oH{fzwFRQ;mT;*3lKLjz0w@cg3e;)2BFRQ=@ql+=kS F1^|m>5RU)= delta 56 zcmeBUoWjU%%*)I5)-qxuyM?NwerR!OQL%nvQbuNRMrw9(X;M*QZem_$VxE3pYI%HG LW=?AH#5e;0_uvzO diff --git a/q02_rename_columns/__pycache__/__init__.cpython-36.pyc b/q02_rename_columns/__pycache__/__init__.cpython-36.pyc index 687491c04ee351a2a8984006b2759809a18bb255..1bd4e85a33d7f3114cc89390fbdaa9e3c2e1f1a4 100644 GIT binary patch delta 50 zcmZ3^xR8=yEV`WgATsrp5w#Tl6fh6a}U;rT_`#RZAUsrt$JDX9}v FoB@?X5ZeF% delta 56 zcmZ3;xSWyQn3tDJ+A3lqyM=0qerR!OQL%nvQbuNRMrw9(X;M*QZem_$VxE3pYI%HG LW=?AH#5iXF+_e(? diff --git a/q02_rename_columns/__pycache__/build.cpython-36.pyc b/q02_rename_columns/__pycache__/build.cpython-36.pyc index 28092f56cbf20b2cf3ed76ec58daec0caa77a3c0..14669694f16a3638f113719ad382a293ee017075 100644 GIT binary patch delta 464 zcmYjO%SyvQ6rDSnq%l;n3WCyISKXLCR45ej1q!+=B2+~}W~9-isWXYFq`2r8lzxRP z|7SKLu3Y#7g5XU>ap0VL=G?=b3-e{Xn3d-2tW#-xbYCeUZ{**>JJ~|0_PElV6E?R- z0E9z_R14#?wMP?s46&PMLZpObWCTMVIC7fkf@v5 z+L3YpLA>W%R!wPO(JTy9q6>Z;rcqz%8PQK8A-zOs))OADnwkx~q^Bvr?B=PXJPv&g z!4r}5IN|fq?ZuIBWvY5XtzN3N+>=;dtAXbW*N?fFII!I+U{Wn15o%M%STJmG;0Hx& zfn31O!{VyTy~K0l@ID#@zFPIw?c@}ep*u<8csJA>qS zfJ6yH4MQ_yEhAV7QxSWyQn3tF9kKx;i>=yDN`WgATsrp5w#Tl6fh6a}U;rT_`#RZAUsrt$JDX9}v FJOP-B5cB{5 delta 56 zcmZ3^xR#OKn3tDpqi4iKb_>-g{m|mnqGJ8Tq>RksjMVJn(xjrq+{C=h#611H)bjYW L%$(HXiE*9){(BR- diff --git a/q02_rename_columns/tests/__pycache__/test.cpython-36.pyc b/q02_rename_columns/tests/__pycache__/test.cpython-36.pyc index 1c28f5bca07d49cb3db1ed3590b30c6426cd37e6..6c267c7855e75d4d47f5dc3f0f43a2a84e9220df 100644 GIT binary patch delta 121 zcmcb^bBl-5n3tF9kKx-W&5fMAj2wLFsU>NpIXRo97`qwe1N1ZUb5r$;N{cfx4Gaw| z^~3XvvWp86lT-DR^HWkcpJHNSWQ^K;mbsRZO@x7gp-5tK0Bav()a3iDYQkbbfm>{4 Vi8-aI#YN&ES$3eT_+))HT>$)2BZ&Y2 delta 114 zcmcb`bBBl1n3tF9L_|cC;zmwhMi#F0)RN6|jNOc?VfvxPsYS*5iAfom#TlvD#idC_ ziMfe+nTdJ&d8y^`X_+~x#hXtsF)=dU+I*V1mXS@Afq|h&ahuABqj^8c>(}0z9cvR From bad1fd1390d2204a8d73365a3ac0d4819dcea4e7 Mon Sep 17 00:00:00 2001 From: rushi0109 Date: Sat, 5 May 2018 06:26:14 +0000 Subject: [PATCH 2/7] Done --- .../__pycache__/__init__.cpython-36.pyc | Bin 166 -> 160 bytes .../__pycache__/build.cpython-36.pyc | Bin 522 -> 1116 bytes q03_split_country/build.py | 25 ++++++++++++++++-- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 172 -> 166 bytes .../tests/__pycache__/test.cpython-36.pyc | Bin 1424 -> 1422 bytes 5 files changed, 23 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..e3333706f45462ded5b5d187a5857b31166d8370 100644 GIT binary patch delta 50 zcmZ3+xPXz}n3tF9x8d7~>=yFA`WgATsrp5w#Tl6fh6a}U;rT_`#RZAUsrt$JDX9}v FoB))*5Z3?z delta 56 zcmZ3$xQvnAn3tDJ-6~=tyM=17erR!OQL%nvQbuNRMrw9(X;M*QZem_$VxE3pYI%HG LW=?AH#5gAa-cl0; diff --git a/q03_split_country/__pycache__/build.cpython-36.pyc b/q03_split_country/__pycache__/build.cpython-36.pyc index 5935601a743a778838cf0355c720e3720a4bcae6..e06e5d2d9ef5318878b39c50b2574646e58a0e08 100644 GIT binary patch literal 1116 zcmZuwy>8nu5Edm-k{#O(k~U2@4;`w-b{ljk5EKOxc<7L&Ljf)VBQmxW>L(=C#D+4t zYu}(R&{xvhp-6$gK&Bq$)D7B5;N9_fci-Ldc+l^6>yuyPhih5it$Uvh@;g}S5D2pv z5*9%%w}}JX7H)X3r47hkx0Z!WrK=Wv287t`8 zV7Y%O6U~QmBnlA@OMRuCxoDFrMsR$8q=~bda`vIH>!i3w>futH- z$|TnfR&!c%X)d&}OV)Ibsisp2=}W&gYsaDSbRiO@iAR-Ql$>B@SmUNek`tH7qHMhN ztdNf4I!bcJuZU+3avFM#TT(r5Y<32oXV3xCzbo(v>N}p20Ptpri;RzDrRK@x<>bxyVZfc zwLu@n>QmThypraOD!BzV1m{%-pmtu8r|MjAD)UhWDT_#P0hz+oNb{J<>zU*Ws*6k{ tr=x%C8U6nZM{PmvHMZHbjk-r3L(nET1guK%w+2FWfdr6!5A~d2?>FRJI6nXY delta 258 zcmcb^(Z!-{%*)HAXA=`8$;iO)m;nhe0oe{fTx>E?*_bVbF_=M(=u~XizllyyJ)e4Yyersz*NKmBsDp2u@xld zr6d;LVk$_v#hO=|TTpq6DX-wx=yFD`WgATsrp5w#Tl6fh6a}U;rT_`#RZAUsrt$JDX9}v FJOG#65bpp0 delta 56 zcmZ3+xQ3D4n3tDpgMY+Cb_>-={m|mnqGJ8Tq>RksjMVJn(xjrq+{C=h#611H)bjYW L%$(HXiE$nP{>c-% diff --git a/q03_split_country/tests/__pycache__/test.cpython-36.pyc b/q03_split_country/tests/__pycache__/test.cpython-36.pyc index 51cbfae7c470758b6df9dd0e79f7b32a29cac8f3..268840ec9506dc669757f464fe0858a7064eab28 100644 GIT binary patch delta 95 zcmbQh-N(&o%*)I5+wg6a!9>op9DM1iC26HOIU8@uGRphwXXNLm>KBz3XJi@}8d&Ow x=NDxc7bGU9>L=%?q;8gBVq|2Dnk>isl}&_!fuTrrvLwqQHenD`eDXn-^8mpp9QFVJ delta 97 zcmeC Date: Sat, 5 May 2018 13:26:12 +0000 Subject: [PATCH 3/7] Done --- .../__pycache__/__init__.cpython-36.pyc | Bin 182 -> 176 bytes .../__pycache__/build.cpython-36.pyc | Bin 552 -> 725 bytes q04_country_with_most_gold_medals/build.py | 11 +++++++++-- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 188 -> 182 bytes .../tests/__pycache__/test.cpython-36.pyc | Bin 1149 -> 1147 bytes 5 files changed, 9 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..d6c0e168c0d6f1d274b71a6b382e560fe2725cfe 100644 GIT binary patch delta 50 zcmdnSxPg(~n3tF9x8d7~>=yE|`WgATsrp5w#Tl6fh6a}U;rT_`#RZAUsrt$JDX9}v Ff&iTk5f=ae delta 56 zcmdnMxQ&tBn3tE!%qn6cyM=19erR!OQL%nvQbuNRMrw9(X;M*QZem_$VxE3pYI%HG LW=?AH#JC^;>Vp$g 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..eb00ee5c5b8310ef905e9553ceddb3b67bb14eb0 100644 GIT binary patch delta 454 zcmYjOJxc^J5KXcluE*UqHVPI8R@br_=g)`Q)pNkT>!#5R(C>S-YQG>WT=$ zTS^JgebS$}KU%->apqxeHai0>mek~yUelTaogpI%4A>om@Pr{^;Ny(dY~+E5ooD?T zPfBWU6hJUT8riGq3!Pcft7NHrM&_l>WYHT6Ex5lUbJ%;Q=;OSsu==KH-@h^Xp>E#6 z{VbO$4-;c6C0tbGi9Qv^xJA>qS zfJ6yH4MQ_yEhAV7Q=yFL`WgATsrp5w#Tl6fh6a}U;rT_`#RZAUsrt$JDX9}v FA^@N)5ibA$ delta 56 zcmdnSxQCJ5n3tDpLr}y-b_>-^{m|mnqGJ8Tq>RksjMVJn(xjrq+{C=h#611H)bjYW L%$(HXiE$AC2+|Y% 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..552d4b24d20449e708a222314c1c884b2cf74485 100644 GIT binary patch delta 73 zcmey%@tcFwn3tF9x8d8U^og7|IQY_2OVUbnayC8{Wt5NC&&bbB)h{Y7&d4+{G_ceU d&o9a@E=WvH)lbe(N!={ZB+A4XHQAKK0|3-U80G)~ delta 75 zcmey(@t1?sn3tDJ-zz36ej?`$7OwQvl8rA#8C6sDLyJ?3iuDtdGBS%ZQnQOolZp~^ f6Z0|?^Yrsl%j45Bb5e^p%QA^FG2WVN%;Et6(h?c+ From 88421b5b06ebfaa63828a5257567ffeae436674d Mon Sep 17 00:00:00 2001 From: rushi0109 Date: Sat, 5 May 2018 13:58:18 +0000 Subject: [PATCH 4/7] Done --- .../__pycache__/__init__.cpython-36.pyc | Bin 177 -> 171 bytes .../__pycache__/build.cpython-36.pyc | Bin 523 -> 832 bytes q05_difference_in_gold_medal/build.py | 16 +++++++++++++--- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 183 -> 177 bytes .../tests/__pycache__/test.cpython-36.pyc | Bin 1104 -> 1102 bytes 5 files changed, 13 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..afe180c97d9c97fb197f34401f051fdbf5ce8c9e 100644 GIT binary patch delta 50 zcmdnUxSEmOn3tF9x8d7~>=yD7`WgATsrp5w#Tl6fh6a}U;rT_`#RZAUsrt$JDX9}v Fd;ywu5d#1K delta 56 zcmZ3@xRH_Fn3tE!%qn6cyM=0;erR!OQL%nvQbuNRMrw9(X;M*QZem_$VxE3pYI%HG LW=?AH#5i97=a3UW 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..26c4c0663a8920f5714b30ac7be2da46db2b3279 100644 GIT binary patch literal 832 zcmaJ?|-hgM>mMR4=K*j7vK*XP|`8+>6-^_UZXfQau{QQ-EAP9Xydkbvz6vUkZaKy1f z6n7_~0h~mIWke&~#sU?WJ=z03`TF>cm0k>& zrnW-|b9rg>a3-wSzK20*_}nOdX4^@dKx)5jwNYY&F37E^ny9i6prKTzpfPiPS&1en z*#ban8cV(aV-z)E#r&)xd_rSBX?dHF%gKZuwD>}EvG|1S0EoZ6%4Vh%nXTPSjvtI4 zXRnRDa1|>=Rv0caqn2eQ3zt{c%thg|%kfFxvOwRu5IOw3De&i|;7n!bwNyNHOV8XYuo#WZKGAr+^Qu1lyxbVcvF z3niGd)t delta 288 zcmX@W*3F`9%*)I5*E%NZKLZ29V<3hDCLqfJh>J}oDjTz;__nB6c95$$5*dATci`vG^8KLCP)Gywco)%3Dl%1-B+|WRhjPHTgV~ mjWI|e!g>e`WXvrNo80`A(wtN~kf(|{fCL942O|$74-){3(@53; diff --git a/q05_difference_in_gold_medal/build.py b/q05_difference_in_gold_medal/build.py index 9fb11ec..1559a6b 100644 --- a/q05_difference_in_gold_medal/build.py +++ b/q05_difference_in_gold_medal/build.py @@ -1,9 +1,19 @@ +# %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 = df.drop([147]) + dfGold = df['Gold'] + print(dfGold.iloc[:,0].astype('int').max()) + print(dfGold.iloc[:,0].astype('int').min()) + diff = dfGold.iloc[:,0].astype('int') - dfGold.iloc[:,1].astype('int') + diffIndex = diff.idxmax() + print(diff.max()) + return diff.max() +q05_difference_in_gold_medal('./data/olympics.csv') 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..d2db12bbaa6ab8c3152660e1d1d4aa1013b04a19 100644 GIT binary patch delta 50 zcmdnaxRH_Fn3tF9x8d7~>=yEI`WgATsrp5w#Tl6fh6a}U;rT_`#RZAUsrt$JDX9}v Ff&rbA5gPyi delta 56 zcmdnUxSf&Rn3tDpLr}y-b_>-M{m|mnqGJ8Tq>RksjMVJn(xjrq+{C=h#611H)bjYW L%$(HXiE+UI1>Y0t 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..563c948197bb0c85efe77059b9084f56e36a9c44 100644 GIT binary patch delta 95 zcmV-l0HFWS2+jxzGYt(2`!VfWT#*UW2o7gubY^vIY_Z@K0Uuf~Xm4$0FLHHrXlXDp zFgY(*Z*psMaA9L*FJo_HWs@2LrUPkk1Czr7ya5rDfCGmLS_W`oZe(F|auAad1V2F5 BAXxwa delta 97 zcmV-n0G|KO2+#-#GYt(2WlCIHRFMhO1PW(mbg|?W0VQBBRdZ!>b1z|HXlZk3WovVF zVsc?^VQy(*ZZB?ScVA{{Y-Mwk7y_mP>5~AH!2-Mi5|e%dhYH#TaA9s_VRLd3lMe(x DasDDX From 2c0c3c0f36f27035fa7ba3f73920226e12aec8b1 Mon Sep 17 00:00:00 2001 From: rushi0109 Date: Sat, 5 May 2018 14:11:17 +0000 Subject: [PATCH 5/7] Done --- .../__pycache__/__init__.cpython-36.pyc | Bin 163 -> 157 bytes .../__pycache__/build.cpython-36.pyc | Bin 511 -> 706 bytes q06_get_points/build.py | 9 ++++++++- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 169 -> 163 bytes .../tests/__pycache__/test.cpython-36.pyc | Bin 1468 -> 1466 bytes 5 files changed, 8 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..9ff0b8557192a2efab2d23c3eb8b1dd8e4288651 100644 GIT binary patch delta 50 zcmZ3?IG2&#n3tF9x8d7~>=yD~`WgATsrp5w#Tl6fh6a}U;rT_`#RZAUsrt$JDX9}v F>;aQ65X%4n delta 56 zcmbQsxR{aMn3tE!%qn6cyM=0ierR!OQL%nvQbuNRMrw9(X;M*QZem_$VxE3pYI%HG LW=?AH#5j8Z-%b+; diff --git a/q06_get_points/__pycache__/build.cpython-36.pyc b/q06_get_points/__pycache__/build.cpython-36.pyc index d45fe38e1dfa35d316d77f85e60e28faa5563d06..d0b821f3c8c3e182c0c86c2b924487e79e8385ae 100644 GIT binary patch literal 706 zcmZWm&1&2*5SHYh^=@`cTLK}EuorvV(n2AG&>nINg&YdH7{yYuPGm`uJmKjBqEj&y*$zVupQGiZhrgh+CGMVk%W746;e6?gtUc6T z-mYGkRw&kpveL3`l)HbynP-KTo5s|Y%PV(RfyBXrv>5y&xbqM^+M*r)g14CCLv$Tv zqOXKcFA01R9_=uX_Yt7U2%U}4bRQiAd@{oKMmYI{XGftcJ47(j{EWt@TJk=~>Y`ft zK7x#<=e4{Owht<4`oU^-FKGHnLxbyof!Pd@AuJ<1T#0L`E1ELrH%2T;7aQi+9pRVX zkllmkpQpuIH=?kuTi2^stM|ocZEu`ml_)CB#oslR#_DTP`QmoW?8Wv!uz&nr+(2K03!p#V+JI^1Y|n^ak0rnWnG>W))s~+juggV22Hk!83y&q zK;>WnQU=1#KwQiNBuW@+7@8St8Nq6qswB#bGD}hwD)UQ=6pHh6N=q{H^As{ti&FhG z8H<>K>NS~eu@oehWZYs(Nn6QK#0C`l<*OfBoLW?@pO}=9S)7rYU0j+}l$e{CmzkKS zpO;!5pT?4zlUh9aD5IqoNPRKL0Srt<96(Z&^A=k{VqQvO@hzr;lv}KMrMU%_x0vz@ xZcWx7^Dzv6B5A=6uZS?lbfGXnv-e=@?J4W83!W=BM&1F69BijMauvH diff --git a/q06_get_points/build.py b/q06_get_points/build.py index 4f4afd7..14503a0 100644 --- a/q06_get_points/build.py +++ b/q06_get_points/build.py @@ -1,9 +1,16 @@ +# %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) + df['Points'] = df['Gold'].iloc[:,-1].astype('int') * 3 + df['Silver'].iloc[:,-1].astype('int') * 2 + df['Bronze'].iloc[:,-1].astype('int') * 1 + return df['Points'] + +q06_get_points(path) diff --git a/q06_get_points/tests/__pycache__/__init__.cpython-36.pyc b/q06_get_points/tests/__pycache__/__init__.cpython-36.pyc index 7db8f24d1cfbd68122874365ad040fdb7da11db9..1c9de3872fa0391cc6af6837a7a83997f20b3c20 100644 GIT binary patch delta 50 zcmZ3=yC?`WgATsrp5w#Tl6fh6a}U;rT_`#RZAUsrt$JDX9}v FTmhC%5aR#< delta 56 zcmZ3?xRR0Gn3tDpLr}y-b_>-o{m|mnqGJ8Tq>RksjMVJn(xjrq+{C=h#611H)bjYW L%$(HXiE*v~{f-l{ diff --git a/q06_get_points/tests/__pycache__/test.cpython-36.pyc b/q06_get_points/tests/__pycache__/test.cpython-36.pyc index 8cccf4a4cb145cdffdc18c5d5cd41c9cf7a4e854..35c0ea122b3d40348587b041701f26fe6a4b5962 100644 GIT binary patch delta 202 zcmdnPy^EXEn3tF9x8d6;<%yg#gqc$~QaDq%Qn*uiQg~DNQutE@CT{WI;7d;}Nh{6C znZ&4|Db2vZ@UjU+2!IGNAdxwn8Aw<%0lC^BF$oaCIN6hNDN_;e?*`MIh3 zMWw|VnFfXimipoOMcKs#iOH$@$@wX%lS`OBF-C1pXU<_{lLBfklABz|DlS&U2V{e6 fDP{u_9E=<+9Lz<0li65vxn)4AWI+TUP^ldNH;^$~ delta 234 zcmdnRy@#9An3tEU-76+ab|U8tVU85e6s{ER6rL2`6uuPx6oC}xiCa8axYAQgCbKXq zXtFRcFuXJa5}7QFK$ZfCs{`Viu>*-Bp!CZykeI<_U&f_OFBvC)VT@M|(hn_8Eh^Se zOv=bC&PdHJE=?**%uUS8Ow7~IOD&I2%gjkFo?OKAiQ^VqaB5K|kQ2xvzPXv%kI`5f wXj+jxh!8;~L_u6$ARz$6#cV)=gOP)UgSm)zG7D=iw=76n4n*)yu3@zU0BgoK5C8xG From 3c83d5c44efe32b84c12226f90d42767052fbadf Mon Sep 17 00:00:00 2001 From: rushi0109 Date: Sat, 5 May 2018 14:12:55 +0000 Subject: [PATCH 6/7] Done --- .../__pycache__/__init__.cpython-36.pyc | Bin 162 -> 156 bytes .../__pycache__/build.cpython-36.pyc | Bin 397 -> 561 bytes q01_load_data/build.py | 10 +++++++++- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 168 -> 162 bytes .../tests/__pycache__/test.cpython-36.pyc | Bin 1529 -> 1529 bytes 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/q01_load_data/__pycache__/__init__.cpython-36.pyc b/q01_load_data/__pycache__/__init__.cpython-36.pyc index 5e9e2e2740ce75441ea56a2372f1c0fc7b50e02f..d06a8e5f7af52743d22ddebfe11b46d42f58e41c 100644 GIT binary patch delta 50 zcmZ3)IERtln3tF9x8d7~>=yE#`WgATsrp5w#Tl6fh6a}U;rT_`#RZAUsrt$JDX9}v F>;RIg5XS%j delta 56 zcmbQkxQLP6n3tE!)hc2lyM?O1erR!OQL%nvQbuNRMrw9(X;M*QZem_$VxE3pYI%HG LW=?AH#5g+u;dm1g diff --git a/q01_load_data/__pycache__/build.cpython-36.pyc b/q01_load_data/__pycache__/build.cpython-36.pyc index 6ba929f81e1637f061d24aff6573e73d7e24f86f..d3cc2c2b59d57f594664a3fdf3f7d1b203e69e4d 100644 GIT binary patch delta 391 zcmYk2F-yZh6vyvf(lo}li<3@52Z=*dEhs`MiXga%;2>lvNA4u8NiN(aN=u4^xCkAJ zpTg1EZ<0m9$-yt+XoQ99REG@LKzEBkwN$q{Wr6SlNx4{j91iLT z>IMoiTi}2V4X{A1V?N#Jc${U-lhGtjM}h9(3*35Xr7Yo0s~R#d`>@-q;Qxgy;$W?` U`?2JCBnH*LY8%C_78thk2lCEaUjP6A delta 249 zcmdnU(#x!D%*)GFZW9wVn}LDhF%ZK66OiQq#KjsDmDSl&7=sx!Stmv)=P&}rK-d{1 z#{wk4QcP76%^B$i|pF$2|uiC;eY zp~b01#rla!8JWcysoBM)NkxgdiFuicdHQ*&=uVjZhlH>PO2Tqy~QA99E=={Jj?*)BRBv6 diff --git a/q01_load_data/build.py b/q01_load_data/build.py index 1a26cc1..87da74f 100644 --- a/q01_load_data/build.py +++ b/q01_load_data/build.py @@ -1,10 +1,18 @@ +# %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, header=0) + new_header = df.iloc[0] # grab the first row for the header + new_header[0] = 'country name' + df = df[1:] # take the data less the header row + df.columns = new_header # set the header row as the df header + return df +q01_load_data('./data/olympics.csv') diff --git a/q01_load_data/tests/__pycache__/__init__.cpython-36.pyc b/q01_load_data/tests/__pycache__/__init__.cpython-36.pyc index 46496ca72cf628223c8e5f0e036e3f379bb90b43..0dc2ad65eb0292081b154a6d58c0daebce5b839f 100644 GIT binary patch delta 50 zcmZ3%xQLP6n3tF9x8d7~>=yF=`WgATsrp5w#Tl6fh6a}U;rT_`#RZAUsrt$JDX9}v FTmY5G5Z?d* delta 56 zcmZ3)xPp=0n3tEU(4s>IQY_2OVUbnayDL+Wt8{U&&bbB)h{Y7&d4+{G_ceU z&o9a@E=WvH)lbe(Nu4aram-q-GbFCKV;- zCgx=(=IQ69mdB@M=A;%+7G&~a Date: Sat, 5 May 2018 15:28:05 +0000 Subject: [PATCH 7/7] Done --- .../__pycache__/build.cpython-36.pyc | Bin 1116 -> 911 bytes q03_split_country/build.py | 22 ++++++------------ 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/q03_split_country/__pycache__/build.cpython-36.pyc b/q03_split_country/__pycache__/build.cpython-36.pyc index e06e5d2d9ef5318878b39c50b2574646e58a0e08..2c6173dfaafc69638c22b5c17691453a5788308e 100644 GIT binary patch delta 508 zcmZuty-wsX5cW8~8-8>`;v^cNBn?8Mp;*z-pOBzRvobr`B`YT}c90ebTBM~#r&Br# zdLH8*;9kJGSKu8O2MP)-&3vEdn?L)1{5whx*VdA|e{b0X|C4kJ&KL{GPRNWT*RYl? z;T~E**kUu7apdSN`OHHfgGbVwGGr~xd;|M*A;wd{0Y#E04_FhC9xqAj z*}$klN2ldFG3G zVRSRMGI^Bvki>7r^V{ZgphM&nvu zmz7Dm^_6HYEyu~{BdD`>Pqjb4-`Z*B2RX)Lz6!u1BlZo3z6+qYa{_t%?j Qy3m)t{Wrzk(BFaecaN}nWB>pF delta 688 zcmZuuJ&)5s5ZzgOZO8fGbVp7gfrt=|X((u~OO*12MCS%A87Hxo*w%Va+*yuNm=+=A z_Wl5Wh96+jBO%dIQ8DWr5lCpYJ8x!Z-kaI|=zjJ5m&2i7UH%Ba*`NGo?=Z#$?J4cz zI~|%;tcD$Es374r0PB#|Av+NjAUtG=leoyys(Iqo3~dxEj?M?Z;}u6i_dRrLF!;jM zA7cKI+*;T65%_NoEXmT07D+hlfiwvUxT6d9c zuC{5>T7_1>ASh4&PMFN&RBl3{l`PifXqs)`#%Y8TooTrVAhhLmTm<|-I)-N7NgJU9 zPjI3v`iNHKDo%APinYumWj?CqIkvr-)N-z*#C~7dmugp>Ogi6lhFq zCs~|^HmWRd9Tk}Y!(I{TH*t#5b?DH=MV`vQY3*Fp;L~~l12~0IXN`YOp0Pf7pvKJ?{#2+wr8htM Say%xW&i*~_H<|SW&VK`6J-OTf diff --git a/q03_split_country/build.py b/q03_split_country/build.py index f164392..b705050 100644 --- a/q03_split_country/build.py +++ b/q03_split_country/build.py @@ -8,23 +8,15 @@ def q03_summer_gold_medals(path): 'write your solution here' df = q02_rename_columns(path) + + df['country name'] = df['country name'].str.split('(',1).apply(lambda x :x[0]) + df.set_index('country name',inplace = True) + df.dropna(inplace = True) + df.drop(['Totals'],axis=0,inplace = True) print(df.shape) print(df.columns) - dfNew = pd.DataFrame(df['country name'].str.split('(',1).tolist(), - columns = ['country name New','country code']) - dfNew['country code'] = dfNew['country code'].astype('str') - print(dfNew['country code'].dtype) - countryCodeDF = pd.DataFrame(dfNew['country code'].str.split(')',1).tolist(), - columns = ['country code Final','trash']) - mergedDF = df.join(dfNew) - mergedDF = mergedDF.join(countryCodeDF) - finalDF = mergedDF.drop(['country code','trash','country name','Combined total'],axis=1) - finalDF = finalDF.rename(columns={'country name New': 'country name', 'country code Final': 'country code'}) - finalDF = finalDF.set_index('country name') - print(finalDF.shape) - print(finalDF.columns) - finalDF = finalDF.dropna() - return finalDF + + return df q03_summer_gold_medals('./data/olympics.csv')