From 8e6f8173be0a993d7e497bdbfd5b71582925e8a8 Mon Sep 17 00:00:00 2001 From: bhushan45 Date: Tue, 21 Aug 2018 07:15:11 +0000 Subject: [PATCH] Done --- __pycache__/__init__.cpython-36.pyc | Bin 165 -> 147 bytes data/scraped.csv | 28 ++++++------ .../__pycache__/__init__.cpython-36.pyc | Bin 179 -> 161 bytes .../__pycache__/build.cpython-36.pyc | Bin 568 -> 598 bytes q01_load_data/build.py | 11 ++++- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 185 -> 167 bytes .../tests/__pycache__/tests.cpython-36.pyc | Bin 1577 -> 1559 bytes .../__pycache__/__init__.cpython-36.pyc | Bin 180 -> 162 bytes .../__pycache__/build.cpython-36.pyc | Bin 626 -> 1059 bytes q02_append_row/build.py | 42 +++++++++++++++--- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 186 -> 168 bytes .../tests/__pycache__/tests.cpython-36.pyc | Bin 1355 -> 1337 bytes .../__pycache__/__init__.cpython-36.pyc | Bin 182 -> 164 bytes .../__pycache__/build.cpython-36.pyc | Bin 888 -> 955 bytes q03_scrape_clean/build.py | 16 ++++++- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 188 -> 170 bytes .../tests/__pycache__/tests.cpython-36.pyc | Bin 1396 -> 1378 bytes .../__pycache__/__init__.cpython-36.pyc | Bin 177 -> 159 bytes q04_mapping/__pycache__/build.cpython-36.pyc | Bin 877 -> 1084 bytes q04_mapping/build.py | 24 ++++++++-- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 183 -> 165 bytes .../tests/__pycache__/test.cpython-36.pyc | Bin 1685 -> 1667 bytes 22 files changed, 96 insertions(+), 25 deletions(-) diff --git a/__pycache__/__init__.cpython-36.pyc b/__pycache__/__init__.cpython-36.pyc index b4b72099455159189764a0ad76aa1fabbc62e96a..cc1a6ca85301f368d5fe547736b713c813061272 100644 GIT binary patch delta 51 zcmZ3=IGK^dn3tF9_Uh{Bi5%wg4*D7SxvBa|8KuP;iFqcb`r-LS*~JBk$*KCu`6;Or G3rqo~0ufvQ delta 69 zcmbQtxRjB@n3tD}Z`Piui5%vJLHeP^sYS*5iAfom#TlvD#idC_iMfe+nTdJ&E~&-Y YCHV#V`30$Y@dZWsS*gh-#S`O90UFa7!TWt0|YB<7iz>WAkSWfvDDCa3Br=clAj)@C$k$YVuY_107b7Asj%0fr*Pzj8TTMh#$z-WVyvwkeHW}SX{&d!`D TOp5#<+l$$N1P3Dv69+p0qPjM_ delta 208 zcmcb{vV+CRn3tC;cmAHJXABGskAWBtn1Cz?ATAaG5-AKRj5!QZj44bh%qAhGG03eP%m5A8GLHZN diff --git a/q01_load_data/build.py b/q01_load_data/build.py index 061a01f..e8ba622 100644 --- a/q01_load_data/build.py +++ b/q01_load_data/build.py @@ -1,5 +1,14 @@ +# %load q01_load_data/build.py import pandas as pd path = 'data/excel-comp-data.xlsx' def q01_load_data(path): - "write your solution here" + 'write your solution here' + df = pd.read_excel(path) + df['state'] = df['state'].apply(lambda x: x.lower()) + df['total'] = df['Jan'] + df['Feb'] + df['Mar'] + return df + +q01_load_data(path) + + diff --git a/q01_load_data/tests/__pycache__/__init__.cpython-36.pyc b/q01_load_data/tests/__pycache__/__init__.cpython-36.pyc index 2a2dfc72b54611f7a4f5a7734a9c697f606c0089..3d19641a3e89666c81901b0f1c7c432b098a0559 100644 GIT binary patch delta 51 zcmdnVxSWy0n3tF9?&|93i5%wgA^I8lxvBa|8KuP;iFqcb`r-LS*~JBk$*KCu`6;Or G3p@d^;t{R@ delta 69 zcmZ3^xRa5?n3tD}ZT6n1i5%vJY5JkXsYS*5iAfom#TlvD#idC_iMfe+nTdJ&E~&-Y YCHV#V`30$Y@dZWsS*gh-#S`N^0Vnbq3jhEB diff --git a/q01_load_data/tests/__pycache__/tests.cpython-36.pyc b/q01_load_data/tests/__pycache__/tests.cpython-36.pyc index 76e04c8a5e2c476c2fba795d8bae25fd09cc88ed..2772771ffa6d175e32a98f543b302c2d90a1df46 100644 GIT binary patch delta 54 zcmZ3nA2AR#B cXP4v`=;s%t=EWBjk*g$ delta 69 zcmZ3)xP_6!n3tE!c-Ee%i5%vJiTa_%sYS*5iAfom#TlvD#idC_iMfe+nTdJ&E~&-Y YCHV#V`30$Y@dZWsS*gh-#S`OP04|alBLDyZ diff --git a/q02_append_row/__pycache__/build.cpython-36.pyc b/q02_append_row/__pycache__/build.cpython-36.pyc index 508826776138177582df97d666bb284c1e1484b0..43a9a0dbe3a6c00af747687e547d1f48c37a17e4 100644 GIT binary patch literal 1059 zcmZuvOK;RL5VrH!S9jYYRf1ls+;$_iNgworT7(4Z0YNWRLP}L4Z|vPoNaElm>Mm?g z<-nysgfsufS5Eu|PK>=v=}Or0c*gVeH*?hMb?hHsE)Q*lexe7<0{#V@@&gcx0z@%2 zQXCliHUm@NR$wtRv6BX~fHpO40d3!6wXyOt(@wS)tO0KYHnnNvD+;=-%WSPT-XXV1 z5Jsp&*~s~{e;AUYU^xv1zaA8%nz+w84y^vQh%4sIcrBcgr*#$c+?g=J`dUp#&M9~w zgefO9q@*GXXRR#jOoamrI=Z~s|b{9K|_Fbp~(ofdL&U_gyC*=UlKb&MBLoUWl44q6=2lB8Q4X z?b`VTK%;XP%ihX2K5wgpKAT1?-HUiu>?zrsrsXsO)bxVpA$4BDDZc@!&>Y?38$8FV zP1K~;*xE)3R`B298>2E3b8diz=Kk5xCTKyESQKxgIW+kMY01!%v6M_LnM(;GgQW!$ zPHf;>w0&pXSaSOnD?53$$HZT54LPK}Rs0qXR__6*>Bj#0G@;{l=g0jQPV!T~0{; z^w@vT#mBNB5%VKXnO~5ck}@3EF=aF?1W#C0`KuG@59>IkUNMvFtBM`SP;LQ1xP_nK z4&K7+_gg%Icef{-VMuuthO)89CED-~Uz?TE;HBt+B)aO!N_d>hCXGc7BPSbCEr1V> z$AZmB#j`XXdjBogTbUhCSE~WkC1@NTkWH1Vb&_#fr|kJ-kjix+7JOk7@8GTh+{Pbx Cg&t=B delta 430 zcmYjNu}%U(5Z&3mgA+wG(L_613IoR07!!?!i8g5A6uDH%!t1OSvnS+La&tK>Pg`4?;?ly}i?FU*7afwcV z+V_wq&9Wl>V~E(dnRpZ-sefkllr+dJ*x(FHIPX#&?=H`Yv$|h yq)}Y%SVADwgB{q!)Z5tAig{tc6TyvM!!~DTWOAy^{GA1r<)usk!GkTj!Tta=N^7H49?sYS*5iAfom#TlvD#idC_iMfe+nTdJ&E~&-Y YCHV#V`30$Y@dZWsS*gh-#S`Pa075z$d;kCd diff --git a/q02_append_row/tests/__pycache__/tests.cpython-36.pyc b/q02_append_row/tests/__pycache__/tests.cpython-36.pyc index 742ee79571b722fe1fcab2f42f1dbcae23a14bd1..55ef2298f305e227ab35f02d8819ffaa25265b89 100644 GIT binary patch delta 54 zcmX@jwUdj(n3tD}eRFm6Mvk+L@ z66eLDb*!WR3}7WNvU=5@a%1>7NVU#YpAgJ~86Wc;6V3u5Z%E0=DOWla*Wp<(3PPos z#*jsk#Cy&(7nyp0*oVy_NyQXNl-{Y7WxIRiLddboS&SqW2^L?_hgPv}kNR{;B1^(l zPbZ67EHaImrVgKoc;QOS*c54%<@sbzU8eLr$Av4RTZ}a=-t0lgE3aym!EGOwVGXun l1ALHeqx2euQ#o{343zESxU#is{$iVFV|Qnmm9 delta 230 zcmdnZ{)0`~n3tDJ;Mtz2uZ#=~j~S2v3y|#q#Km3{m7RrBm|Ga4xKbE{88lg5f>il! zJYvphn4lk8oLW?@pO}=9S)7rYU0j+}l$e{CmzkKS?~+=aU6Nm*pI?xg7hh16pOuJ8awt=<)h*7V)WnqdjFQ}(TkOgCc_pcNCAU~IbMljKu@$A}CFZ8yVofY4 z$f>-=mRMX;S&({*Ek6ll$gRnbnCuwYCo3|Gvq=J-qRBnkj@gk>a&jxPq9D*448~wiYLbT003Bv8QlN? diff --git a/q03_scrape_clean/tests/__pycache__/tests.cpython-36.pyc b/q03_scrape_clean/tests/__pycache__/tests.cpython-36.pyc index 8529c871c1d09e03d187c6dc0d0810c3df16d3e3..fe27bfe52cd4eb2ce0c9e6ba71eb645709088c45 100644 GIT binary patch delta 54 zcmeyu^@xkZn3tE!drNinMvgCx@*(;e`MIh3Ng1WZ8Hsr&ruyOeMcKs#iOH$@$@wX% Jn{}DonF0Qh5^Vqg delta 72 zcmaFF^@WSWn3tC;bkUxujT~PX4b${Pi&Kk=^%IjaGK(`(vx`fUiV|}Z^D-0j^j%Vm cvrF;|^z#c+^WqDN^0QKtONuv3Gr2PZ0Lmd6sQ>@~ diff --git a/q04_mapping/__pycache__/__init__.cpython-36.pyc b/q04_mapping/__pycache__/__init__.cpython-36.pyc index ee0618f2c89597e870d478c12dab4aec6d95e7c7..b76b9328ee9a20b84d6306d158d279a444b4f622 100644 GIT binary patch delta 51 zcmdnUIG>Tjn3tF9_Uh{Bi5%wgKKdE?xvBa|8KuP;iFqcb`r-LS*~JBk$*KCu`6;Or G3mgHgRuPN< delta 69 zcmbQwxRH^=n3tE!W7eLii5%vJar&XfsYS*5iAfom#TlvD#idC_iMfe+nTdJ&E~&-Y YCHV#V`30$Y@dZWsS*gh-#S`Nk0Wn7zEC2ui diff --git a/q04_mapping/__pycache__/build.cpython-36.pyc b/q04_mapping/__pycache__/build.cpython-36.pyc index 8283165768b4bf279030f79c34448f8435bb4125..af946894721d2d1b5e646fd9a3a523266ddc6042 100644 GIT binary patch literal 1084 zcmZuw&2AGh5VpO)O`9|ngjxwut~rpjrEox11>(e|m#RWChn2H-n_YI-Tia=qke<>9 z;5Fb8cobhb^%XcV-n6Jl*qU#~V|#YKnf0r7yY=?x*UvvZgnpq1!w35vh`t2ih~olL z+-O2cqdn?1+NS|%QiNqhqcWy3MuOyPc}sYJ>kV!IwwKsVjJQWT+^3s7;NcCTUC|XC zvAHC0@2|!23F=3;@NIP5C$@93yPvSS78OsFyt3_!-Myrcj3=BKHs5hL6w_1`FH>38 zFWq`DE%bEWZMJl(SS|P<)t4!8L16?Sj^zgs{SCmN1zO^3VsK6tkm+T<4@|hkdBh3#Zs3gb9wI>he$Uy?lgAw5HU70Fy7nPz%dt1>`Nq=2XhC=c zciIadq7WX!9RmF0`Sz8{jOfkeMD?^RCMJ_rZ!DCUZ=Y7M!+R%&8KHaftoObYDoa_4 zfr=YWJ2?T-F~9=lXbH zQZY;=7sHxWoay9zl5xS4TFG3bW_YoCkd)AytU4c#CRxD;^~}bH1uI9K9d+H;LD2m9 zgM)*^LZ+$0Fe8;z6=v?JE)~i@$JxIDAKrm*;dn>h1V}6#L zWfd!EbobBL=#E@dqZLFhr}YPXTHw%601%0B3va-DhPPmLLDW<5_aE7CRX?>3OGtO7 zEs>fA)ugOv%GHU!IagxFj4X?6H280|2md~VK~wOiMhadqvc6+u!_`xO$i;`HkAU6O2 delta 519 zcmZ8dJxd%x7@l`#cbz-Wa7Y@7orN4kPofbE2};rhY{ceLEVDO*-s=O`~A1U7tYvE_Rk@o z9T0Hu^V-HoU|Q(tmJOtaW7dlwg7T;b{>kOmi&RyWDRgSft6?Y$CniLM*95#Ka;#=E zxZw_RUISU878+JqE?hK&Jl0%`TT+DRJ|m9)=E&ZNLMTr(70we2Gjz{u_hmuB`ec?VeV)%+1hY z^PIngc9Ze-x1OIIKP1$}M=Hy#kI^Y-dL0{{=y|2Rv_|Q4i0^%(&`m4j1v(PacU(+; z3yn)hg*Ml|`N22AH(jwh2y59n&08;CZtbLFDi{@~A%I;X#wE026_)9C3HBMqdM%$+ ys?Z8;hg=#pMbAt0aWNTJQ~R{J6NlSD`PlxyL2`dw>dA$91*AYpB&oOL9ry!pO@96W diff --git a/q04_mapping/build.py b/q04_mapping/build.py index 70c43fe..1c624bd 100644 --- a/q04_mapping/build.py +++ b/q04_mapping/build.py @@ -1,12 +1,30 @@ +# %load q04_mapping/build.py import pandas as pd import sys, os import numpy as np +from greyatomlib.pandas_guided_project.q02_append_row.build import q02_append_row, q01_load_data +sys.path.append(os.path.join(os.path.dirname(os.curdir))) path1 = 'data/excel-comp-data.xlsx' path2 = 'data/scraped.csv' -#sys.path.append(os.path.join(os.path.dirname(os.curdir))) -from greyatomlib.pandas_guided_project.q02_append_row.build import q02_append_row + def q04_mapping(path1,path2): - "write your solution here" + 'write your solution here' + df_final= q02_append_row(path1) + scraped = pd.read_csv(path2) + print(df_final.head()) + print(scraped.head()) + scraped['United States of America'] = scraped['United States of America'].astype(str).apply(lambda x: x.lower()) + scraped['US'] = scraped['US'].astype(str) + mapping = scraped.set_index('United States of America')['US'].to_dict() + df_final.insert(6, 'abbr', np.nan) + df_final['abbr'] = df_final['state'].map(mapping) + return df_final + + +q04_mapping(path1,path2) +# Df=pd.read_excel(path1) +# print(Df.head(5)) +q04_mapping(path1,path2) diff --git a/q04_mapping/tests/__pycache__/__init__.cpython-36.pyc b/q04_mapping/tests/__pycache__/__init__.cpython-36.pyc index eef3d6b1231b64feb39c7d081ba06fa45658052b..0b47c8255ca614090546a181b50a6064d22987e8 100644 GIT binary patch delta 51 zcmdnaxRjB@n3tE!dRKMyL=JQLApMN|+*JLfjMCza#5@yI{qX#v?BasN~wiYLao0{~&98UO$Q diff --git a/q04_mapping/tests/__pycache__/test.cpython-36.pyc b/q04_mapping/tests/__pycache__/test.cpython-36.pyc index 7f7c96e914a8d9dd0deb7c46cab1b7ff9ad3e05a..165730a39afc71e370816fc06ac08e3c5acdc9df 100644 GIT binary patch delta 54 zcmbQr+sw;h%*)GVy{kHUBgb<_c|ZM({M=Oiq>R$yjKn+>Q~mJ#qU_>=#N<@{ J%?eDVECAF25xM{X delta 72 zcmZqXoyyB$%*)H=vv*I_MvmuQb`iV&ynZ+5Y*~O(vMTxnId6|iM`Yx%( b*(Lb}`uPQ^dGQ5B`B|ySCB>Whm`Ygymu4Cg