From d8c6787fc48e5216b9a5657505ea7eff5460d7f4 Mon Sep 17 00:00:00 2001 From: ShardulJ Date: Sun, 12 Aug 2018 04:09:51 +0000 Subject: [PATCH 1/8] Done --- __pycache__/__init__.cpython-36.pyc | Bin 165 -> 146 bytes .../__pycache__/__init__.cpython-36.pyc | Bin 179 -> 160 bytes .../__pycache__/build.cpython-36.pyc | Bin 568 -> 455 bytes q01_load_data/build.py | 12 ++++++++++-- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 185 -> 166 bytes .../tests/__pycache__/tests.cpython-36.pyc | Bin 1577 -> 1558 bytes 6 files changed, 10 insertions(+), 2 deletions(-) diff --git a/__pycache__/__init__.cpython-36.pyc b/__pycache__/__init__.cpython-36.pyc index b4b72099455159189764a0ad76aa1fabbc62e96a..34b48d655ccd8835ecd6cf9e90f62e20a85bcf32 100644 GIT binary patch delta 50 zcmZ3=IEj(Nn3tF9<)-}Ti5%u~_WBw5xvBcW8Hq(Hr8!>u;rT_`#RZAUsrt$JDX9|+ FOaYi85iI}! delta 69 zcmbQlxRjB@n3tD}Z`Piui5%vJLHeP^sYS*5iAfom#TlvD#idC_iMfe+nTdJ&E~&-Y YCHV#V`30$Y@dZWsS*gh-#S>#q0UC@LzyJUM diff --git a/q01_load_data/__pycache__/__init__.cpython-36.pyc b/q01_load_data/__pycache__/__init__.cpython-36.pyc index 92b3ac2d3dd2682028775eba5dae0f9658f2aebd..cbc6b94d9e26ff62e24b55ef3ab0f4c259f0b8ab 100644 GIT binary patch delta 50 zcmdnYxPXzvn3tF9<)-}Ti5%u~zWN#YxvBcW8Hq(Hr8!>u;rT_`#RZAUsrt$JDX9|+ FoB^L&5oG`X delta 69 zcmZ3$xS5f|n3tDJb=ID!i5%vJ3HqVMsYS*5iAfom#TlvD#idC_iMfe+nTdJ&E~&-Y YCHV#V`30$Y@dZWsS*gh-#S>$l0V+lr4*&oF diff --git a/q01_load_data/__pycache__/build.cpython-36.pyc b/q01_load_data/__pycache__/build.cpython-36.pyc index e27baf631ae2be11ac2de9e6f21754e2497753d8..6d1a45a1e12c01a798bfa79c1cee9b940bcfa832 100644 GIT binary patch literal 455 zcmY+Ay-ve05Xb$IgeW2mY?T;TJG23@MhFRsp%Ps>AcY}vbA~p!b#Po!P?^fhu<|%w znGkQl#5pX*(*1m2^8L?eX_|b0=-ZeQ@=10ML;nJ;Jw^Zlsz^bB6%058Z=~RoOSYvH zD-+TWzp#spUwR;{$mF_`YEbD#Gw|_nt=e^k1G?iM4$v;q+8kj?O*dpqU+IPd?U9<* zd`rBad$Jz3_(f1wh@)gDh)Dg#1ceX-mm5$ zp=^wmUCk8?n`f8)%ZGm97(r-459tv#2k4{1=r(7N5VauK>t0;NYbk<{cX;r;h?jzt*(Tbp=_V#wv{Fxf-{YPA z4t|nc1;MZ2$w{lCf!}ZbW@a)uYPVa{|4)M#0C*;Rortt!g54zIz?p;r;}MVl!64%7 z46?>6Mc{PAf}j&_#Do)qJtlH6VRKlp2R3J%bzl;$?k|>h56Ii-1Wr1z9c1%Eu7wzN zNbh%UP3c5;rfSo*O4hDaRd+0m@QHQk#8>k$M8FxrrbKg?z=F(-oo37@Qr!we3cGs* zlTiHaB0smn*c^*-X~*K))`h_-RwY*XFJZ5p(z(*28fv2^V&rVDvEpclS9Qq+|8(a! z2ZuwckPkUJ%!|5|d|%Ie+LJgfIQG}VL-?EcTJ+zGVdU5O*UXeS%ucSr++*MmP2mzg#|PMNMku+do=0!U$n05VhDA+ht~h ibSm6jJ;|(-x%7Rj6P9F_#nRqX@mh+0Sg;M>oW}1D6OCyA diff --git a/q01_load_data/build.py b/q01_load_data/build.py index 69d7209..508bf0f 100644 --- a/q01_load_data/build.py +++ b/q01_load_data/build.py @@ -1,5 +1,13 @@ +# %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" + df=pd.read_excel(path) + df['state']=df['state'].str.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..71fe0b009ef3f0cfc53148d1a38d2dabb193e578 100644 GIT binary patch delta 50 zcmdnVxQvm*n3tF9&8Gb5i5%u~!TK5bxvBcW8Hq(Hr8!>u;rT_`#RZAUsrt$JDX9|+ FJOQHZ5r6;y delta 69 zcmZ3+xRa5?n3tD}ZT6n1i5%vJY5JkXsYS*5iAfom#TlvD#idC_iMfe+nTdJ&E~&-Y YCHV#V`30$Y@dZWsS*gh-#S>#a0Vk^&2><{9 diff --git a/q01_load_data/tests/__pycache__/tests.cpython-36.pyc b/q01_load_data/tests/__pycache__/tests.cpython-36.pyc index 76e04c8a5e2c476c2fba795d8bae25fd09cc88ed..e7edca86ae2acbf2c084efbfc03a8298c9d11226 100644 GIT binary patch delta 53 zcmZ3nA2AR#B cXP4v`=;s%t=EWBj Date: Tue, 14 Aug 2018 14:30:32 +0000 Subject: [PATCH 2/8] Done --- .../__pycache__/__init__.cpython-36.pyc | Bin 180 -> 161 bytes .../__pycache__/build.cpython-36.pyc | Bin 626 -> 839 bytes q02_append_row/build.py | 23 ++++++++++++++++-- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 186 -> 167 bytes .../tests/__pycache__/tests.cpython-36.pyc | Bin 1355 -> 1336 bytes 5 files changed, 21 insertions(+), 2 deletions(-) diff --git a/q02_append_row/__pycache__/__init__.cpython-36.pyc b/q02_append_row/__pycache__/__init__.cpython-36.pyc index de0cf6163be25541da218f6f8a0c4d005729c09c..2a67a5bfe992c7e932cc1c0bc2cd89a4715c67fe 100644 GIT binary patch delta 50 zcmdnOxR8;u;rT_`#RZAUsrt$JDX9|+ FTmYZm5orJb 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>#)04_@zApigX diff --git a/q02_append_row/__pycache__/build.cpython-36.pyc b/q02_append_row/__pycache__/build.cpython-36.pyc index 508826776138177582df97d666bb284c1e1484b0..fe1a63b24fc0363dacb2184c7e34fb1d4d77b24a 100644 GIT binary patch literal 839 zcmZuvxsKZ~5aprEhV2~4fd%pdD%RR7oe=~`u*C-1W)}#c6ap>MS0qtO%7`6EmDBEr zI?W|gKK}`ac_hGgZhBc0}L1da}F@z01Q;v z?}gQrGy$;qb-;Zd+>@qLcR-=ewV_w6F!WN44gJWJaVuG|3?%bYnJx1|E33$Dh~wUT zT1X|5dBMdh43xbmLrQKs??Jsw#d2Y&UgpZT36GVfD7c}SOpTYyB4t(BHBQN@nIU{) zNOcN!26i5k>LPY;Eiv5eQg#!xyw-+D9lxF`v1XObv-x=V-@^8S%5Z)i#=R~;>Bns%Rb#p#IbP+-#N`V9opPs`#CJ-_FLK8i&R?Os1p*MDH4$`- zOt3L>!7;Kr+QcHJ1UN)riAaFHCt3U(Z;^Ky4b#iT)1o#K3Xoo&qs(YA;^42*-7$hE zJ-Mbk+Ebvw2C`N3gjDpJ?3ia2?-|55w2F4Tr&Zi@NMLfqc2OUpT>9nlmDOI&wx+W) zXX?&t)6CY&s=(jKCh${L2L4vs5PRcgjfF)+J!cse2YS^Qs|wwK`kW%d?sCYV}SbA_!h3!IA-<5D-W{zmKrB>VFz|KOB$ zxh&V(t<{C=N+gtxmQ8-5+=Vx7ZjiTVt*O+xcX=xtkgiyD8WjB7&Mz0wirWGPy}ayn z4fA#z4(}gKhBw_uAS|Vi=phdK5LekGB)7zN50}{E)&*vqc(Jl-E4|s&x}5)4dVcR0 i=cDrYP$Ti!Ufv#3Bhc9;tLQ0R=0sjjW0IuZ# diff --git a/q02_append_row/build.py b/q02_append_row/build.py index af3701d..4a02a13 100644 --- a/q02_append_row/build.py +++ b/q02_append_row/build.py @@ -1,11 +1,30 @@ +# %load q02_append_row/build.py import pandas as pd import sys, os #sys.path.append(os.path.join(os.path.dirname(os.curdir))) from greyatomlib.pandas_guided_project.q01_load_data.build import q01_load_data - +path='data/excel-comp-data.xlsx' def q02_append_row(path): - "write your solution here" + df=q01_load_data(path) + t1=pd.DataFrame(df['Jan']).sum() + t2=pd.DataFrame(df['Feb']).sum() + t3=pd.DataFrame(df['Mar']).sum() + t4=pd.DataFrame(df['total']).sum() + Total=[t1,t2,t3,t4] + df2=pd.DataFrame(columns=df.columns) + df2.loc[0]=df2['Jan'].append(t1) + df2.loc[0]=df2['Feb'].append(t2) + df2.loc[0]=df2['Mar'].append(t3) + df2.loc[0]=df2['total'].append(Total) + frames=[df,df2] + frame=pd.concat(frames,ignore_index=True) + return frame +q02_append_row(path) + + + + diff --git a/q02_append_row/tests/__pycache__/__init__.cpython-36.pyc b/q02_append_row/tests/__pycache__/__init__.cpython-36.pyc index dab3ecac755f4882f0d0d63dd70ab57f6fb428f8..5b891f5f9d06f0dd7b8ee3610ade5e706c4b2663 100644 GIT binary patch delta 50 zcmdnRxSWy0n3tF9<)-}Ti5%u~A^I8lxvBcW8Hq(Hr8!>u;rT_`#RZAUsrt$JDX9|+ Fya1y15rF^z delta 69 zcmZ3^xQmg)n3tEUXwIIfi5%vJ>H49?sYS*5iAfom#TlvD#idC_iMfe+nTdJ&E~&-Y YCHV#V`30$Y@dZWsS*gh-#S>$_073H^dH?_b diff --git a/q02_append_row/tests/__pycache__/tests.cpython-36.pyc b/q02_append_row/tests/__pycache__/tests.cpython-36.pyc index 742ee79571b722fe1fcab2f42f1dbcae23a14bd1..ce9e1c37f896ba4f0f9a20452642012dee2f2d52 100644 GIT binary patch delta 53 zcmX@jwS$Ypn3tF9<)-}TjT~ng Date: Sun, 19 Aug 2018 13:06:25 +0000 Subject: [PATCH 3/8] Done --- .../__pycache__/__init__.cpython-36.pyc | Bin 182 -> 163 bytes .../__pycache__/build.cpython-36.pyc | Bin 888 -> 1096 bytes q03_scrape_clean/build.py | 25 +++++- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 188 -> 169 bytes .../tests/__pycache__/tests.cpython-36.pyc | Bin 1396 -> 1377 bytes scrapeddata.csv | 78 ++++++++++++++++++ 6 files changed, 101 insertions(+), 2 deletions(-) create mode 100644 scrapeddata.csv diff --git a/q03_scrape_clean/__pycache__/__init__.cpython-36.pyc b/q03_scrape_clean/__pycache__/__init__.cpython-36.pyc index e99e1734469b0d74feccbb92229a5c70c95d8904..d029d420962cc67053d8ac9b72b9ed465f37c64c 100644 GIT binary patch delta 50 zcmdnSxR{Z{n3tF9<)-}Ti5%u~0s0yFxvBcW8Hq(Hr8!>u;rT_`#RZAUsrt$JDX9|+ F+yJ2F5pe(j delta 69 zcmZ3?xQ&s+n3tE!a@L-xi5%vJ$@-zisYS*5iAfom#TlvD#idC_iMfe+nTdJ&E~&-Y YCHV#V`30$Y@dZWsS*gh-#S>%Q05L5YF8}}l diff --git a/q03_scrape_clean/__pycache__/build.cpython-36.pyc b/q03_scrape_clean/__pycache__/build.cpython-36.pyc index cdec2c4c90379271521fc76a792f2606530a2690..e235fddda4bcb1406d9047419fc16373d20ebf04 100644 GIT binary patch literal 1096 zcmZ8fOK;pZ5GJXo_u&``P{c)17`^SGs}||0FpRdj6|FDZpnw8Y;A&_uWv$4NRN`G| zPfm~d3%&O*@!C`VLQWlOiz0}G`R1WdoCoLGd_H-8w|iMcg#1H3dSbMHK(T)y00G*P zl8%~{Y}8R1jXEx4)T~XmX_-D7)0;bA#$vVnz%^@ z@<0#q5JP-U4#|)-DM|)0B!9AV0x4wg7$q3X(M}=%&pR3U$b}OifqBS=teFgfGZ{G< zOwUO(g&EA>VvYg*OM;vkoQ8&m3>$iMy`R;pbE0!!yPXz3cH-V)f7wQG5XPF&+50KN zZy_o>-SS#2n2*6IZPM^HP%x6!s_nO(9fSL)FFNT2T&x^-!d|GGiyybb$eRB@tMD5` zS)tfdgn=}8eGfRTa||w`>ksthm>)AIR<|+~M(_V7W{&I+zZM&{6~$`94fO5L#qY}8 zS&h{dwE|IS-T}AOZ7)GUrHyJt?TT05JgaPNxE5923f>j#Ube8*JD*>+e7gpI^(54T zLiS&M%3fZ!s^+b|LgPr@KRTWUz#U)K_Vr@!b0c2$!aD1tTj4y@;F(lD-neaBo){c# z6-<+14xh*l#Cby%?xWtcp0*||T1aNK>a6gQ zL}tw!+rh&k+cXX--e^&FNFb37sK+hT43AU-wrV z=d}I4C`7k>Bk!aZAo)_6+ah?yFVeb7-Bd4@t7T=w#aDd2HsZD9PGXHXoAh`s<}n`U zBfGPnDQnKqE2Fjj&V+^VvF2{$Q|w!G;NwQg&SxM^7>7^m-k?1e^igMFCCu1fez{e+ V5aKGFWoHOEJHv)%^h=sQ`4=@=AnE`B literal 888 zcmZWn&2H2%5Vn(SHccto6KW-dB5svX1L}2Ef#AfUm#UY&EZ)qtn>2}C+W~g9J#FE} zgYXVKiLXdVeE=>!G0yT+l|=J-G9G{P%{YfUJL%}hx5-b=*mrj4iO7FRX5JD2175QU z@7G`w^lLZ?`!$+G7*vBQ#*lE>V?wyK=Kkdj0tm0!Bn5uL_M;o(W5)&6>z|NtK=zu< zd?v80;w!f1SKJ0wxZ+i`=D_#ZRj{Hep6e5t$FtyfH12o!zbHgsIOPuh&xLr8RYMp; za!oa=#FENY0P&a+M+)@C$s?WVa`%HSEoKYZ>CDKwv!!gaIcn5i`^`4N@jiFMg7%u$ z-1z8n_q3%$keygz(PZ*0d)1&W3-PyMpXQrBAu|sMR;;4&La_E_!{b|?Ip%pas#+9C zF8}zI=`BjVeV3ma)Fv0Rd1>Z&VY-3LTI z!k=({`TTHd3M~{)iyG3iEz{+a($=J2cj~@EolR6u2#o0;Y4@)P8QQ#n!s0BsLdoY(;}^Ae5>XE*8cv z6uMZ>d><~ha_U(_7k0Y#)JDnHApL`9FZ$VRASJn3tF9<)-}Ti5%u~Vfq>QxvBcW8Hq(Hr8!>u;rT_`#RZAUsrt$JDX9|+ Fd;p{V5s3f* delta 69 zcmZ3~wiYLbU003A-8QTB= diff --git a/q03_scrape_clean/tests/__pycache__/tests.cpython-36.pyc b/q03_scrape_clean/tests/__pycache__/tests.cpython-36.pyc index 8529c871c1d09e03d187c6dc0d0810c3df16d3e3..629c9f091831cd61083942bf58f4a0bbc4e479ec 100644 GIT binary patch delta 53 zcmeyu^^l9hn3tF9<)-}TjT~PX<%0Dy@^e%5gEJC~Qc82Y^uzOuvWp86lT-DR^HWkc J>oU1B0{{k$62$-j delta 72 zcmaFJ^@WSWn3tC;bkUxujT~PX4b${Pi&Kk=^%IjaGK(`(vx`fUiV|}Z^D-0j^j%Vm cvrF;|^z#c+^WqDN^0QKtONuv3F}X7X0Lj%FrvLx| diff --git a/scrapeddata.csv b/scrapeddata.csv new file mode 100644 index 0000000..c9fe2f6 --- /dev/null +++ b/scrapeddata.csv @@ -0,0 +1,78 @@ +,United States of America,Federal state,".mw-parser-output .monospaced{font-family:monospace,monospace}USUSA840",US,00,,,U.S.,U.S.,U.S.A.,,,,, +1,Alabama,State,US-AL,AL,01,AL,AL,Ala.,Ala.,,,,,, +2,Alaska,State,US-AK,AK,02,AK,AK,Alaska,Alaska,Alas.,,,,, +3,Arizona,State,US-AZ,AZ,04,AZ,AZ,Ariz.,Ariz.,Az.,,,,, +4,Arkansas,State,US-AR,AR,05,AR,AR,Ark.,Ark.,,,,,, +5,California,State,US-CA,CA,06,CA,CF,Calif.,Calif.,"Ca., Cal.",,,,, +6,Colorado,State,US-CO,CO,08,CO,CL,Colo.,Colo.,Col.,,,,, +7,Connecticut,State,US-CT,CT,09,CT,CT,Conn.,Conn.,Ct.,,,,, +8,Delaware,State,US-DE,DE,10,DE,DL,Del.,Del.,De.,,,,, +9,District of Columbia,Federal district,US-DC,DC,11,DC,DC,D.C.,D.C.,Wash. D.C.,,,,, +10,Florida,State,US-FL,FL,12,FL,FL,Fla.,Fla.,"Fl., Flor.",,,,, +11,Georgia,State,US-GA,GA,13,GA,GA,Ga.,Ga.,Geo.,,,,, +12,Hawaii,State,US-HI,HI,15,HI,HA,Hawaii,Hawaii,H.I.,,,,, +13,Idaho,State,US-ID,ID,16,ID,ID,Idaho,Idaho,"Id., Ida.",,,,, +14,Illinois,State,US-IL,IL,17,IL,IL,Ill.,Ill.,"Il., Ills., Ill's",,,,, +15,Indiana,State,US-IN,IN,18,IN,IN,Ind.,Ind.,In.,,,,, +16,Iowa,State,US-IA,IA,19,IA,IA,Iowa,Iowa,"Ia., Ioa.[1]",,,,, +17,Kansas,State,US-KS,KS,20,KS,KA,Kans.,Kan.,"Ks., Ka.",,,,, +18,Kentucky,State (Commonwealth),US-KY,KY,21,KY,KY,Ky.,Ky.,"Ken., Kent.",,,,, +19,Louisiana,State,US-LA,LA,22,LA,LA,La.,La.,,,,,, +20,Maine,State,US-ME,ME,23,ME,ME,Maine,Maine,Me.,,,,, +21,Maryland,State,US-MD,MD,24,MD,MD,Md.,Md.,,,,,, +22,Massachusetts,State (Commonwealth),US-MA,MA,25,MA,MS,Mass.,Mass.,,,,,, +23,Michigan,State,US-MI,MI,26,MI,MC,Mich.,Mich.,,,,,, +24,Minnesota,State,US-MN,MN,27,MN,MN,Minn.,Minn.,Mn.,,,,, +25,Mississippi,State,US-MS,MS,28,MS,MI,Miss.,Miss.,,,,,, +26,Missouri,State,US-MO,MO,29,MO,MO,Mo.,Mo.,,,,,, +27,Montana,State,US-MT,MT,30,MT,MT,Mont.,Mont.,,,,,, +28,Nebraska,State,US-NE,NE,31,NE,NB,Nebr.,Neb.,,,,,, +29,Nevada,State,US-NV,NV,32,NV,NV,Nev.,Nev.,Nv.,,,,, +30,New Hampshire,State,US-NH,NH,33,NH,NH,N.H.,N.H.,,,,,, +31,New Jersey,State,US-NJ,NJ,34,NJ,NJ,N.J.,N.J.,N.Jersey,,,,, +32,New Mexico,State,US-NM,NM,35,NM,NM,N. Mex.,N.M.,New M.,,,,, +33,New York,State,US-NY,NY,36,NY,NY,N.Y.,N.Y.,N. York,,,,, +34,North Carolina,State,US-NC,NC,37,NC,NC,N.C.,N.C.,N. Car.,,,,, +35,North Dakota,State,US-ND,ND,38,ND,ND,N. Dak.,N.D.,NoDak,,,,, +36,Ohio,State,US-OH,OH,39,OH,OH,Ohio,Ohio,"O., Oh.",,,,, +37,Oklahoma,State,US-OK,OK,40,OK,OK,Okla.,Okla.,Ok.,,,,, +38,Oregon,State,US-OR,OR,41,OR,OR,Oreg.,Ore.,Or.,,,,, +39,Pennsylvania,State (Commonwealth),US-PA,PA,42,PA,PA,Pa.,Pa.,"Penn., Penna.",,,,, +40,Rhode Island,State,US-RI,RI,44,RI,RI,R.I.,R.I.,"R.I. & P.P., R. Isl.",,,,, +41,South Carolina,State,US-SC,SC,45,SC,SC,S.C.,S.C.,S. Car.,,,,, +42,South Dakota,State,US-SD,SD,46,SD,SD,S. Dak.,S.D.,SoDak,,,,, +43,Tennessee,State,US-TN,TN,47,TN,TN,Tenn.,Tenn.,,,,,, +44,Texas,State,US-TX,TX,48,TX,TX,Tex.,Texas,Tx.,,,,, +45,Utah,State,US-UT,UT,49,UT,UT,Utah,Utah,Ut.,,,,, +46,Vermont,State,US-VT,VT,50,VT,VT,Vt.,Vt.,,,,,, +47,Virginia,State (Commonwealth),US-VA,VA,51,VA,VA,Va.,Va.,Virg.,,,,, +48,Washington,State,US-WA,WA,53,WA,WN,Wash.,Wash.,"Wa., Wn.[2]",,,,, +49,West Virginia,State,US-WV,WV,54,WV,WV,W. Va.,W.Va.,"W.V., W. Virg.",,,,, +50,Wisconsin,State,US-WI,WI,55,WI,WS,Wis.,Wis.,"Wi., Wisc.",,,,, +51,Wyoming,State,US-WY,WY,56,WY,WY,Wyo.,Wyo.,Wy.,,,,, +52,American Samoa,Insular area (Territory),ASASM016US-AS,AS,60,AS,AS,A.S.,,,,,,, +53,Guam,Insular area (Territory),GUGUM316US-GU,GU,66,GU,GU,Guam,,,,,,, +54,Northern Mariana Islands,Insular area (Commonwealth),MPMNP580US-MP,MP,69,MP,CM,M.P.,,CNMI[3],,,,, +55,Puerto Rico,Insular area (Territory),PRPRI630US-PR,PR,72,PR,PR,P.R.,,,,,,, +56,U.S. Virgin Islands,Insular area (Territory),VIVIR850US-VI,VI,78,VI,VI,V.I.,,U.S.V.I.,,,,, +57,U.S. Minor Outlying Islands,Insular areas,UMUMI581US-UM,UM,74,,,,,,,,,, +58,Baker Island,island,UM-81,,81,,,,,XB[4],,,,, +59,Howland Island,island,UM-84,,84,,,,,XH[4],,,,, +60,Jarvis Island,island,UM-86,,86,,,,,XQ[4],,,,, +61,Johnston Atoll,atoll,UM-67,,67,,,,,XU[4],,,,, +62,Kingman Reef,atoll,UM-89,,89,,,,,XM[4],,,,, +63,Midway Islands,atoll,UM-71,,71,,,,,QM[4],,,,, +64,Navassa Island,island,UM-76,,76,,,,,XV[4],,,,, +65,Palmyra Atoll,atoll[5],UM-95,,95,,,,,XL[4],,,,, +66,Wake Island,atoll,UM-79,,79,,,,,QW[4],,,,, +67,Micronesia,Freely associated state,FMFSM583,FM,64,FM,,,,,,,,, +68,Marshall Islands,Freely associated state,MHMHL584,MH,68,MH,,,,,,,,, +69,Palau,Freely associated state,PWPLW585,PW,70,PW,,,,,,,,, +70,U.S. Armed Forces – Americas,US military mail code,,,,AA,,,,,,,,, +71,U.S. Armed Forces – Europe,US military mail code,,,,AE,,,,,,,,, +72,U.S. Armed Forces – Pacific,US military mail code,,,,AP,,,,,,,,, +73,Northern Mariana Islands,Obsolete postal code[9],,,,CM,,,,,,,,, +74,Panama Canal Zone,Obsolete postal code,PZPCZ594,,,CZ,,,,,,,,, +75,Nebraska,Obsolete postal code[10],,,,NB,,,,,,,,, +76,Philippine Islands,Obsolete postal code,PHPHL608[11],,,PI,,,,,,,,, +77,Trust Territory of the Pacific Islands,Obsolete postal code,PCPCI582,,,TT,,,,,,,,, From fe7f683edf777c1028cd95a2508729894088f43a Mon Sep 17 00:00:00 2001 From: ShardulJ Date: Sat, 25 Aug 2018 12:21:27 +0000 Subject: [PATCH 4/8] Done --- .../__pycache__/build.cpython-36.pyc | Bin 455 -> 455 bytes .../__pycache__/__init__.cpython-36.pyc | Bin 177 -> 158 bytes q04_mapping/__pycache__/build.cpython-36.pyc | Bin 877 -> 943 bytes q04_mapping/build.py | 21 +++++++++++++++++- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 183 -> 164 bytes .../tests/__pycache__/test.cpython-36.pyc | Bin 1685 -> 1666 bytes 6 files changed, 20 insertions(+), 1 deletion(-) diff --git a/q01_load_data/__pycache__/build.cpython-36.pyc b/q01_load_data/__pycache__/build.cpython-36.pyc index 6d1a45a1e12c01a798bfa79c1cee9b940bcfa832..1c664b74acd10c5fbd1f98f4728fa80bd44b05eb 100644 GIT binary patch delta 76 zcmX@ke4Lrhn3tD}ck@KH`;50HK2u}loy^NvpvTX^z@W);i>)9rFD0?Kh#kl+;sy~Q Oi6UN9f^YI_Mi~ItQV>r7 delta 76 zcmX@ke4Lrhn3tF9^`?nz_Zg!mK2u}lnas;rpvT9+z@W);i>)9rFD0?Kh#kl+;sOyM Oi6S0Uf_L(2Mi~I{*AS!t diff --git a/q04_mapping/__pycache__/__init__.cpython-36.pyc b/q04_mapping/__pycache__/__init__.cpython-36.pyc index ee0618f2c89597e870d478c12dab4aec6d95e7c7..e46661f8ca6fb6e7a7858e784bfde3f85e2f019b 100644 GIT binary patch delta 50 zcmdnUIFFITn3tF9<)-}Ti5%u~-ufB&xvBcW8Hq(Hr8!>u;rT_`#RZAUsrt$JDX9|+ F908tE5nTWP delta 69 zcmbQoxRH^=n3tE!W7eLii5%vJar&XfsYS*5iAfom#TlvD#idC_iMfe+nTdJ&E~&-Y YCHV#V`30$Y@dZWsS*gh-#S>#40Wkm>DgXcg diff --git a/q04_mapping/__pycache__/build.cpython-36.pyc b/q04_mapping/__pycache__/build.cpython-36.pyc index 8283165768b4bf279030f79c34448f8435bb4125..6f2170e7e72f5e1b764afb374b878b4c587cd148 100644 GIT binary patch literal 943 zcmZuvL2uJA6t?h4;_~Xsz55E~9zsRlO;QBdEbAkW_ zXhJxxm~mFI!<~vedQ()@9`@68f3TePZ_iL}Ti^dj>qLc7)Q5Ph64ahjh9 z1)0z#Slk+sQo$<9A^k8w9)s}h~UU9uHLv))&B!H&!G-jd>Zr>GVF(wPJ| zIjDg@!Y|qc0#v;#UT>2XYF(ougl#gZFWnWzb)%{mVzmbNumMfj9J#1dgDq%%b13@2 zA9HW9bEV@#cIIlTJ4PkbB34;vEVZ=GiO8(;N)D~_R%q)Lsu0QPnqt4}8p2}dJj0{V zIV(gVO-EgHUZhgTkywQ1Ste2mN1a3KnKI2?F&yf3`PbG#33Y^bU54>lY`7n1c_Jd& z-LNbN9%?CIP~D1k%rv!5q9O#D@t{iKZCDrLsIbl=&aE3)`BdcG1+8-HN7zc5nXYHO zTomK|8#=((bFp8-0k4;a2BpS#qIb~EpV$4dN@f3SEHq4$lm2_9Kbjm}^&~?M}Q-*ulG({zr<@|7@PQfs+VwxoY?IqP3+WmXj7%9?Ykfz z1Mv@+eep2#~E!~E?B1IRpHKeBLMh- z4*-1)!k_`I@hvg9A_E4?8$5=eqRKP=8dm`$%)5gK=UpI>{==TLou>*JEIA?8*;ndBqhN`1%`CuIS&NlT*!=PH4U= z^@?BUE?2anqNF1E$n}MhZ6cvxS*v8l3!{^k3PyEy-j$5A2X}IL^g3&xv!yss@~*7e zyzOngsA-ckdNOf*0O;n$R^WV5%YxSW1dL6bC8x{#5aO&)^IX|LyHaO+$~}}NEwi!W zlx2nfVneD;-*W3|1A%aL-P;|_O;!rVuWe*x#>&FjuoO_Cu|%}i6I56ac+LVFwA8F# zZq%`j*;#g03Ru;rT_`#RZAUsrt$JDX9|+ F+yS9#5p@6n delta 69 zcmZ3&xSf&1n3tF9@$NlQ6FJNcQ}jcNQ;UlA6O%GBi!)NQi%XM=5_1#tG86OkT~dp) ZOY#f!^9xe*;tPuMvr>~wiYLap0{~%N8U6qO diff --git a/q04_mapping/tests/__pycache__/test.cpython-36.pyc b/q04_mapping/tests/__pycache__/test.cpython-36.pyc index 7f7c96e914a8d9dd0deb7c46cab1b7ff9ad3e05a..659fb9efb26678f8d719d9e26541d786c741701b 100644 GIT binary patch delta 53 zcmbQr+r-OZ%*)I5a#McvMvmuQb`iV&ynZ+5Y*~O(vMTxnId6|iM`Yx%( b*(Lb}`uPQ^dGQ5B`B|ySCB>V0nMzpzml_%n From 75faed67ba182d21f1c8e1b6bc8b666e0d7cf0c5 Mon Sep 17 00:00:00 2001 From: ShardulJ Date: Sat, 25 Aug 2018 13:15:37 +0000 Subject: [PATCH 5/8] Done --- .../__pycache__/build.cpython-36.pyc | Bin 839 -> 839 bytes .../__pycache__/__init__.cpython-36.pyc | Bin 192 -> 173 bytes .../__pycache__/build.cpython-36.pyc | Bin 808 -> 1081 bytes q05_replace_missing_values/build.py | 20 +++++++++++++++++- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 198 -> 179 bytes .../tests/__pycache__/tests.cpython-36.pyc | Bin 1741 -> 1722 bytes 6 files changed, 19 insertions(+), 1 deletion(-) diff --git a/q02_append_row/__pycache__/build.cpython-36.pyc b/q02_append_row/__pycache__/build.cpython-36.pyc index fe1a63b24fc0363dacb2184c7e34fb1d4d77b24a..5901e831f973af3dd8bff45f9a2cf81edbe77918 100644 GIT binary patch delta 101 zcmX@kcASmXn3tEUZ6oVyM#fu{H!`M5++t2iGrGl=R+N~VT6~KYOs`}p5}&Nc)FvRw nz`&r%af_`WF)t;txQKJ|5hhP5exP6xNTx^}m5`XM&a40cE|VIZ delta 101 zcmX@kcASmXn3tEUb|dR*M#iYg8yQn2qL@?CjBc@|6(#1T7T;n8(<>Q@L?`PpwF!tb nFfeFx++r(8%u7iuF5;McgvnEi4=7j!k|`2JCB!DHGb;c9)|eTC diff --git a/q05_replace_missing_values/__pycache__/__init__.cpython-36.pyc b/q05_replace_missing_values/__pycache__/__init__.cpython-36.pyc index f50c1d5e3fce9c03c9a40722e1899cfd21d8ee70..a81088b9d90f730f928ac327affac9219a5fc022 100644 GIT binary patch delta 50 zcmX@WxR#N_n3tF9<)-}Ti5%u~QTiGAxvBcW8Hq(Hr8!>u;rT_`#RZAUsrt$JDX9|+ F0sy8C5t#r0 delta 69 zcmZ3>cz}_^n3tE!f7YI;i5%vJx%#2SsYS*5iAfom#TlvD#idC_iMfe+nTdJ&E~&-Y YCHV#V`30$Y@dZWsS*gh-#S>!#06n)EZ2$lO diff --git a/q05_replace_missing_values/__pycache__/build.cpython-36.pyc b/q05_replace_missing_values/__pycache__/build.cpython-36.pyc index 6a32964667ab0d808d5677d1ae67893cfb4e2b10..65f104f8d15dd1c5d5e02feaa082b00d6a6d658b 100644 GIT binary patch literal 1081 zcmZ`&OK;Oa5Z;IFI8F;CK--k6V&|0~ z^DGOK;j|%m!8>vi$Y?uA<80f=?Mb92)0NVsf}Cekv;%b+5EBAE2dDz{0Z3UGp#qKY z49)R1nGt~-2#_?;n&I@0TZbTx$lM?;tQnb`s?ZNIAcw}^o?-B(g;P{!bmZRJOf5s$ z(LkaCQ6JK~4K#;X*AP)u8)#IWS#u2kUYXB>Y&GGCnphIcLkr^A;*ofKL!m1x;)$pa z>9uWkgXfZX3f5;griRk{PW${p?drc;=W+E&KQEZ* zCd@5OaLw8hVNhr~4KrY>5s!mw6iO{@&8RVNUYWY5ccpU-XI=1Aa%S& zJiJ=2ya~2eO*^;g^E!ykPR23BB}oR|x>A~?itP_`dBuw~j>3NX!LzpSJ+O9pxZJ#) n{Dpx{15E>_7x&;Lh}u1jQ|O6&YaG-HfQ!pTmWYKd?AHGRomn9^ literal 808 zcmZ`%y^_-~5SC;+PMix|#gMDgx;Xpbpko+jpyir78Z{op(k05-vQDy(BoiuVc?2GS z$KWZLQA?GMnu@h^KPf=#-Osz9N8j#_Pe-HZ+s_~LH$mtZ+B=Y=H{iAn9C2JAiaR9K z>(HluhXD-$Nzp4q8e+sf+UGtU@PPNeAR2Lej^c0&x1h5ayW#c8i>zc?OEp`MIjdPJ zmboa7^QzRxZJsO(yIdc3l+6v(f+xAX$=iuL3n=3L# z3tW?h$30-Yd&b{m0$}_NSzvIV_r_@B@sRhwdKleT2T=7NsxV8me)`eKT1-||VgyqO|iAQ_hz~mB)b#G^^*&cJLf_e3@NJ#R@utw+B5sg!E4CJ2H>p(m#vzgB8Z6 zY&w^AF0O1dHLPSxGL^m)_NuOQT4|v&ZK{RHYny7OIJ4QTkzDY*a(aF8GP~_>C#h!H z4J#U9(`h3Mp6Hc3`u|7mob~_$A`w0Udje(-A&-Zyx07^4a~i0o)GIRp#(8#S9jPom zof)xWbyXH}n*6iBWbfZfx`w))npV<`+R$osE7=Q=Tb2H+vf@o4USr5?yR<&;j2sXj G`}i-#^WbCv diff --git a/q05_replace_missing_values/build.py b/q05_replace_missing_values/build.py index 97d9755..34b7113 100644 --- a/q05_replace_missing_values/build.py +++ b/q05_replace_missing_values/build.py @@ -1,3 +1,4 @@ +# %load q05_replace_missing_values/build.py import pandas as pd import numpy as np import sys @@ -8,6 +9,23 @@ path1 = 'data/excel-comp-data.xlsx' path2 = 'data/scraped.csv' def q05_replace_missing_values(path1,path2): + df1 = pd.read_excel(path1) + df1['total']=df1['Jan']+df1['Feb']+df1['Mar'] + df1.loc[len(df1),:]=df1.sum() + + df2 = pd.read_csv(path2) + + abbr_dict = dict(zip(df2.iloc[:,[1,6]]['United States of America'],df2.iloc[:,[1,6]]['Unnamed: 6'])) + + df1['abbr']=df1['state'].map(abbr_dict) + df1.drop(df1.columns[[6,7,8,9]], axis=1,inplace=True) + #df1.loc[df1[6,6].fillna('MS',inplace=True) + list1 = ['MSS','TEN','none'] + df1['abbr']=df1['abbr'].fillna('MS',limit=1) + df1['abbr']=df1['abbr'].fillna('TN',limit=1) + df1['abbr']=df1['abbr'].fillna('None',limit=1) + return df1 + +q05_replace_missing_values(path1,path2) -#print(q05_replace_missing_values(path1,path2).shape) \ No newline at end of file diff --git a/q05_replace_missing_values/tests/__pycache__/__init__.cpython-36.pyc b/q05_replace_missing_values/tests/__pycache__/__init__.cpython-36.pyc index 03391a7d73977c58beb60b2c9e2dcb47994c3aa6..05de7c22aaf43e249265e41a12e7735e5331b51b 100644 GIT binary patch delta 50 zcmX@cxS5f|n3tF9<)-}Ti5%u~3HllNxvBcW8Hq(Hr8!>u;rT_`#RZAUsrt$JDX9|+ F!T_lz5wQRO delta 69 zcmdnYc#M(5n3tC;e(#>Bi5%vJ#rmPesYS*5iAfom#TlvD#idC_iMfe+nTdJ&E~&-Y YCHV#V`30$Y@dZWsS*gh-#S>%008RE8xBvhE diff --git a/q05_replace_missing_values/tests/__pycache__/tests.cpython-36.pyc b/q05_replace_missing_values/tests/__pycache__/tests.cpython-36.pyc index 3b9d62a38f2709ee27852c154007b83f7dde0610..8452f2d7121019ac07c32a1659ea11801d477601 100644 GIT binary patch delta 53 zcmX@hyNj2@n3tF9<)-}TjT~%Da Date: Sun, 26 Aug 2018 07:42:08 +0000 Subject: [PATCH 6/8] Done --- q04_mapping/__pycache__/build.cpython-36.pyc | Bin 943 -> 943 bytes .../__pycache__/__init__.cpython-36.pyc | Bin 179 -> 160 bytes .../__pycache__/build.cpython-36.pyc | Bin 740 -> 1163 bytes q06_sub_total/build.py | 23 +++++++++++++++++- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 185 -> 166 bytes .../tests/__pycache__/test.cpython-36.pyc | Bin 1424 -> 1405 bytes 6 files changed, 22 insertions(+), 1 deletion(-) diff --git a/q04_mapping/__pycache__/build.cpython-36.pyc b/q04_mapping/__pycache__/build.cpython-36.pyc index 6f2170e7e72f5e1b764afb374b878b4c587cd148..5ab96061c5039403fb0ce62c52b5cc134a8dcb34 100644 GIT binary patch delta 177 zcmZ3_zMh@cn3tF9@J7~mjC!|N5|fgOUa~VVFuddd5u89GM3V_9UXfXRi#;>1ASW?7 zRg>oyQ$fnD$%;%;jJGD+Fv$bS7$!N%Tg)kGh9JV|7AMG{_>|1#l9dcaijyZZmB=as z&C=w)#a57*my%dqBmm^zVlJ*MzQvSZd~31_vxmG4P^d^2M1a&5DWVcele?K!0Mg$v A?EnA( delta 177 zcmZ3_zMh@cn3tDp^G4QpjCxTliAhOCFWDIw7+!LK2u>goqR9jlugENpV$aMg$Vp62 z)#SOwRFD!iS&>PKF>106lRS`&VUm-KVopgj1QAA2oFIeZQ!u;rT_`#RZAUsrt$JDX9|+ FoB^L&5oG`X delta 69 zcmZ3$xS5f|n3tC;X4amli5%vJ3HqVMsYS*5iAfom#TlvD#idC_iMfe+nTdJ&E~&-Y YCHV#V`30$Y@dZWsS*gh-#S>$l0XHfcMgRZ+ diff --git a/q06_sub_total/__pycache__/build.cpython-36.pyc b/q06_sub_total/__pycache__/build.cpython-36.pyc index adaf0ce0d3ca686ab384f6f40e1d0fd216b66a0b..a29bc95a2345de4af9cbad281fe68a0594317c7a 100644 GIT binary patch literal 1163 zcmZ`(&2Aev5a!SBYPFUe*8ytFO#xqZh!m$t4uKK$2kpUteNob)>|sGIDVYlQCnPtp z1^H67$393OqA$X0Pkx1-I$Rq?0=T>2H_Q2UXFkr5`_*um{q^&&zpNvK{ze~N6rR6^ zVSfY=NMMZ^?kr&xEYVRJvl!oT2}?Sz$9iC?PRl;)0~fJO#B4_-qW2qO138eH+}RRf z@C=R9TZoM=#@O#U!&Q|#XEh1rU115y`l$Tk!K{Z1C-G<+X#Fnmv4;(8mpO7A!ki)0CJjF9L-)Q9}(2yG$O z4MY_E5nA;((H6sVc8bJ~7>MDL-o#-JTqbrQ;-f!;O5p$V?mg)J>{IV*2b2%)mB)t& z@^=aXfPz zx^-MHj=w3TQ3YRTZ>x%zQoK5T>0=vc7V-JqFnT_lG5Y5F3m;W=B^f!NL3?AZO63@N z1MUlOk0S$n5SchYNM%C5#=D+0f@MZ>k$3&})V8Ikx-I}@#nO&~KKn?h!g;z@4U1IA zm%L%gLTO!b770@~K30{GSH8D2b=%CZ$2}i6++CjBndh*z7bgLpvwqN?cOgNlbtj&P z#h=K00jmBvn_kwXoX#$}5v@L({#2WHwt2%&IEhf#iAAaH=LU?-wfN+MN;3L3Sc%NqY^X@*x`^0<+?0D#tyEJAOrYx@7 z5`vMcVF&h|mfTd6613>tN)6dnU72tYpnTWXliIRxmquQ5SC?ANCl4x~{Qn7@bn;F3 rOPGTIhXI1Hu0S8b6Y%-;6tuKjz77)XK0u07Jb;ms0f}%#(#QV-WD+)l delta 385 zcmYjM%SyvQ6rD#BV{N1>QE*Z0DuM)cDs!nlc1Fp7g@S0{R%(B zoqr%?tN$Rl^2Tm@;heeW%$Ymf*UfLccj|eqpU?L&B?x_?wE~SU0OoelyIDNteG7yG zxNOWrpd6K`#1)y7l5orkr`+Q9(B4BM%yETBq(XCA(mUik&%2L0%|&-63*9wxQsk-3 zx{1&tv{)SLWrys%_*7GvTW<`tEL1$JsVSzuRojZ?$?@tq30*#j25H77p#z;M;y0w* z@a(rA+#8`yz~Uq|i5SC`W>c1>EDNrL8Rt?3Qi&{5T8_j+ZUV(J&P+5cQZ9J3u;rT_`#RZAUsrt$JDX9|+ FJOQF|5q$sv delta 69 zcmZ3+xRa5?n3tEUbpM{Hi5%vJY5JkXsYS*5iAfom#TlvD#idC_iMfe+nTdJ&E~&-Y YCHV#V`30$Y@dZWsS*gh-#S>#a0ZIEAoB#j- diff --git a/q06_sub_total/tests/__pycache__/test.cpython-36.pyc b/q06_sub_total/tests/__pycache__/test.cpython-36.pyc index 691280a23f33a47bb86c6a2aef8fba66bc436cb3..e1ec325c51872eed4bad702636832780552fbbc6 100644 GIT binary patch delta 53 zcmbQh{g;cwn3tF9<)-}TjT|2t<^1(C@^e%5gEJC~Qc82Y^uzOuvWp86lT-DR^HWkc JYcZuU0|55L5|aP` delta 72 zcmey%HG!MMn3tDp+krh%8#z8Q8Ybz77N-^!>nA2AR#B cXP4v`=;s%t=EWBj Date: Mon, 27 Aug 2018 06:30:25 +0000 Subject: [PATCH 7/8] Done --- .../__pycache__/__init__.cpython-36.pyc | Bin 177 -> 158 bytes q07_symbols/__pycache__/build.cpython-36.pyc | Bin 866 -> 1399 bytes q07_symbols/build.py | 29 +++++++++++++++--- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 183 -> 164 bytes .../tests/__pycache__/test.cpython-36.pyc | Bin 1411 -> 1392 bytes 5 files changed, 25 insertions(+), 4 deletions(-) diff --git a/q07_symbols/__pycache__/__init__.cpython-36.pyc b/q07_symbols/__pycache__/__init__.cpython-36.pyc index 60b0cca0e5314ee04b43a312e722ec776bd47aea..d4139639729e990a6c6de1c3e761f2d9a0c92d0f 100644 GIT binary patch delta 50 zcmdnUIFFITn3tF9<)-}Ti5%u~-ufB&xvBcW8Hq(Hr8!>u;rT_`#RZAUsrt$JDX9|+ F908tE5nTWP delta 69 zcmbQoxRH^=n3tC;b=ID!i5%vJar&XfsYS*5iAfom#TlvD#idC_iMfe+nTdJ&E~&-Y YCHV#V`30$Y@dZWsS*gh-#S>#40XNJUM*si- diff --git a/q07_symbols/__pycache__/build.cpython-36.pyc b/q07_symbols/__pycache__/build.cpython-36.pyc index d28eaa97376de522868951cb3b126c6c53715554..993c15ec866805fd4520e26010e0e54a8b293ac8 100644 GIT binary patch literal 1399 zcmZux&2Aev5GMEEYyDaIu~j6gQS>69k>V6+0Yfla6fKGX)

lum^!!Qr2#`KP9O` zQl*p9V_%?e&{ydr@Y<7KA*T*kM&T6M1-~I@W@o(8S12*>9zToYWCi6&(`7C&c zNSn8LlehK`Snve(!&}IP#(iu$TGF(bYOeHDRU*}!9;2EL`6}V!c~a)pbGsg_gj#Jn zwMiwCR-6qI^=snTIPipb<2#V*5+kHhhPP;sch1&fxQ76p9y+zsy_4PuR++Q6=xT54 z>}}!bcW3U5?Dzf_O4+$O(Ban2qJzyAbORne#6pPrF@4lSdx*7zi0r6`vZJlH$1sma zh#j*AYu>m!->$(HGrL9YKP*eI|EKMIRD1HFHaiC9jXUQ48G^iZy;+mRP|G8T57q60 zZNNO3w{&}tvkvRB2k*esY9V8gov?=ojrD})JRTeO6)lYW1D_f9no8sAQd4mY+lp=j zfX&&PBGsIoPc((jotN|TZ*wlwgl^(DML~1UF3-O*zOrWG(b-HA_j)oR?(6Tz#w*H# z6X$vY?e|5Rr5<~oFUs#An1%Y-fx#*?BM%gUdo(mnBmo5 zNVdW8{g1;%ne*XfK_y#?SHqu5`Bqgl;lre4d|1(fQ8m3;ri`;`CCiK_dicwWucvCA z&q|?&vt=sSpjw+~BxpWk^y-Oa0RwHG-g6v`M43>bu3&QT`+&X+{x$suOc>TR{Zmju z0q^nWz}Zz=_OWb%y{3MEj$NJrJcUtb?R(M&llHPo--7KzziXU|kyvudruBV+fXm#t zzzTpDB&tntPmIUXL>qULR>Vtddrm77%u^u>N<1dZ%J^x)_{xMgvRqcPH3_KF>xvsU zEj00IRf#o;Y60K&L*rLeFD?$^CHySr7ZzTUBirw3oe6yr<|f9r|PZXR2G9A+AOAu z3utUw7Sf(0*qXI6PN|G%X`28F;RQ2ZR;GmsSt{+ZH9@kJFqf8%{M3R?dXKz4VbXR8 c4hQ5}3Vvn7t1duYiOf4gq37R7 z_`!d6`RYZtKbS(4H;_7G7CL(%OM{~$7D7R%H$VPI-7L;~E#dKJ2Gqw*BXIWrYeoHp_zQ)NZ+`K^0=MfXm$ zD4CU6n#A4ZvFM~oI7IzJ?*8|~-MC0nz5v$`z+DHm)H(OKY6880^IvC@7pXYJFftn; RKK5}F%EwP}vq4u;rT_`#RZAUsrt$JDX9|+ F+yS9#5p@6n delta 69 zcmZ3&xSf&1n3tDp^7B1W6FJNcQ}jcNQ;UlA6O%GBi!)NQi%XM=5_1#tG86OkT~dp) ZOY#f!^9xe*;tPuMvr>~wiYLap0{~dT8QK5< diff --git a/q07_symbols/tests/__pycache__/test.cpython-36.pyc b/q07_symbols/tests/__pycache__/test.cpython-36.pyc index 1a8a9c3d7050cc5a1b640e55a727c322ab8a9092..65eea9b69d68281691429e20f004ec4a9de677f4 100644 GIT binary patch delta 83 zcmZqX{=mgy%*)I5a#McvMvnK4a=!W*`MIh3!5N7~DWy4H`r-LS*~JBk$*KCu`6;Q3 nHJBI~qc&?Y&tYT}W?*0_5}$mUC6gnHwIH!1!!T;H4XZlQb`iV&ynZ+5Y*~O(vMTxnId6|iM`Yx%( z*(Lb}`uPQ^dGQ5B`B|ySCB=(HnHU*wZ5Csm!^kGWz`#%>F?k0|CdVz-g2a*x!&{Rz GS=|9#B_nqL From 710cc40e0c17e20286ee9c646a66f6082580bab3 Mon Sep 17 00:00:00 2001 From: ShardulJ Date: Mon, 27 Aug 2018 06:43:50 +0000 Subject: [PATCH 8/8] Done --- .../__pycache__/__init__.cpython-36.pyc | Bin 186 -> 167 bytes .../__pycache__/build.cpython-36.pyc | Bin 1055 -> 1877 bytes q08_append_subtotals/build.py | 38 ++++++++++++++++-- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 192 -> 173 bytes .../tests/__pycache__/tests.cpython-36.pyc | Bin 2221 -> 2202 bytes 5 files changed, 35 insertions(+), 3 deletions(-) diff --git a/q08_append_subtotals/__pycache__/__init__.cpython-36.pyc b/q08_append_subtotals/__pycache__/__init__.cpython-36.pyc index df1c3a25dc9d1d7d1993fbeeddeb2d69af4df5ca..6b6437ab8e0bf8cfd767c5fbf880a96378ea54be 100644 GIT binary patch delta 50 zcmdnRxSWy0n3tF9<)-}Ti5%u~A^I8lxvBcW8Hq(Hr8!>u;rT_`#RZAUsrt$JDX9|+ Fya1y15rF^z delta 69 zcmZ3^xQmg)n3tC;XV#vmi5%vJ>H49?sYS*5iAfom#TlvD#idC_iMfe+nTdJ&E~&-Y YCHV#V`30$Y@dZWsS*gh-#S>$_06-NPasU7T diff --git a/q08_append_subtotals/__pycache__/build.cpython-36.pyc b/q08_append_subtotals/__pycache__/build.cpython-36.pyc index d03d4af14ac147d09523754dc73016ed3fde84ea..b0df5254755b9e74194f8ca32420bae1a8945dba 100644 GIT binary patch literal 1877 zcmcIlON$#v5bo}IXe8}J-nWbi3vnC-@hZDEAuP+1kl=&C3t?>nlY?kYwX`#ymwQ@a zSD8J@IrTbMz_IEm>^B5(p$SRMqrXs#kYa>&fbB>z7|=Km6en@;kZp zIQab)Qgw<92+)*-)JhgQR=S~Ur5Ad@LLZ#40WNrNNf?Mg_@Xgm6z$GQ&%Z$*T=q#sw$Ga6mSq#KSs>h;Io3%K>7x$+Cx;4gw|w6uUXB2 zb_sIUCA&sC3+bNVDq%Cj9p%<+W>P0Vvk^Nn_FhfV-ci14)J_u2b>M+N#$R*^G|=l^ zc+e#?^mUCMq1h!#vvy|`zgs3Av=C`Q8~v=jGr8SHSMNmE{)#4T%y(sxueV1qnyoTf zg%(!OMgLgSwTBg~)t;$+MlIqm5X^mnG!_W%$N~u#h`U6ZwO=>tpl*)c>(*SGti$>{ z+?m=j-jhy^ad9Uc=-7R`S9`THHapO++kl>u4Yi5>x8NRZyv0Zc#l2`->kqokrH)!1 zX1TQ6TI%p*&<^um>b93U$LNx6*qI|Hda?r@*o`UdVZOM=HoJeOo##B)&NDI8&I>NJ zrwYZ>8;Y%SgAGomd$00X3D`eZT#0JG80~+Z2^mLx+Ip4eJQHxd|AqD{qYhm@9LkWr zIPX#IrEwOkki9(9?pcuwgc?ziPO`j`#(iX%d5kozdyZ7KkO57IX;(~;olV`Jjz7Cb zV}Df0j4S-2m%kCYhCh7&UH_uUMF0GPOPHk3``;Jxbyf06^rHeqzvMaaYA~L}AYf3+ zA`y}5zxn*j0WV9D!=RcBZM{{0IEhm@D6e#IlJaZ_{Pbg!4icF@y369=BrPJIR;Tze zH~5zYNi(KBDpyh1YUXU+EIY^^BH8%=vENVrC%=#G^lL6fd$6WjpvoTXE<$*;@99H4 zO{Y@wAGYDs4{o*h(zGU8cySKmvgbE^e1{XUb}^|Eag z{=AR09~F7TRp|3dU6n#RajrrSmFZO&Sb?6kFNGPH-ir20t}YJe;t2m7Mu&zSg-tU* z1Dh6uk!I=;=?Ljb$kbE0i7~?fMuSnD^Ym{`qqpvAQ`245Q)Gm;=mUBm`7zy~JNDh9 z8_ou<%)3I@=oZq0#k)p3RQAxW*VO)ekmNQlLoc6XI43MGac8e8&5BBzS&^n;t;Max f%#=#g(l}RHfio&j&7oDM8v+{8j_*>J1t0wh8tA8} literal 1055 zcma)5%Wl*#6t(l3%&Quq^60J$gftROrc^wHstSp!5(v6!*?1Ew5ah+*Vk-EUqec1OpI_KEl>-RhFetaieCPF{atzkg^226bb#}LB; z5!^(Bm`${Z)kK@v5Dnp^Ez-ie*A#BrCT++q(qT5~GKaOkBGO~{1P$F^@JDn!#C88- z^deAI7?gQQ1uS$gMlS<3OT%2K`4*!k_4zd7VkgSeVn@%tsZi7Tped&)6hiLpXUt27g9VKMs(C-%}_*om_S zy}~dvlh(q9%vm^z%UsruG3#74b0E~6Kf080$+u^DCAU>Bsxr>A?FpB>Hs8~%Hjj8% zn;)sH?Hi_+W)NWjsE3Z4!3mh^fMYlT+$$}YaXfb)e|i1X8;zGBku%O^N=wM_^c#|0 zX#UOoPl`+B({K{22|ou(B~57-)675Q>b%SgKQDL|6f#eER4Tuq8KWvVt7694&9Z+n zdKJ(D8ks(o2CDMIDi+KuX0^L7Xc{tla8IKIL-Qwh?eO+R9#NqVAX#sanjf)GuTR;I zGsdUGw$zj*Ts%~ps!D64V0HTtbU6a_yvC=*1vFxo(xP_OxN1l842r{6Z5Onh?5@Kz z;;^yCOnPg1N?^stqy@hXWPS;^uqi`JO1k4XqarA2D0rja+VwP!&ASNciW-1JMhAEB zCf0Ow*C4~!n}nHIK;KfCNF A-T(jq diff --git a/q08_append_subtotals/build.py b/q08_append_subtotals/build.py index 96e2f9e..e249ffa 100644 --- a/q08_append_subtotals/build.py +++ b/q08_append_subtotals/build.py @@ -1,15 +1,47 @@ +# %load q08_append_subtotals/build.py import pandas as pd import numpy as np import sys,os #sys.path.append(os.path.join(os.path.dirname(os.curdir))) -from greyatomlib.pandas_guided_project.q06_sub_total.build import q06_sub_total -from greyatomlib.pandas_guided_project.q07_symbols.build import q07_symbols +#from greyatomlib.pandas_guided_project.q06_sub_total.build import q06_sub_total +#from greyatomlib.pandas_guided_project.q07_symbols.build import q07_symbols path1 = 'data/excel-comp-data.xlsx' path2 = 'data/scraped.csv' def q08_append_subtotals(path1,path2): - "write your solution here" + df1 = pd.read_excel(path1) + df1['total']=df1['Jan']+df1['Feb']+df1['Mar'] + df1.loc[len(df1),:]=df1.sum() + df2 = pd.read_csv(path2) + abbr_dict = dict(zip(df2.iloc[:,[1,6]]['United States of America'],df2.iloc[:,[1,6]]['Unnamed: 6'])) + df1['abbr']=df1['state'].map(abbr_dict) + df1['abbr']=df1['abbr'].fillna('MS',limit=1) + df1['abbr']=df1['abbr'].fillna('TN',limit=1) + df1['abbr']=df1['abbr'].fillna('None',limit=1) + df1 = df1.drop(df1.index[len(df1)-1]) + df =df1.groupby('abbr')['Jan','Feb','Mar','total'].sum() + + + t1 = pd.DataFrame(df['Jan']).sum() + t2 = pd.DataFrame(df['Feb']).sum() + t3 = pd.DataFrame(df['Mar']).sum() + t4 = pd.DataFrame(df['total']).sum() + Total = [t1,t2,t3,t4] + df2 = pd.DataFrame(columns=df.columns) + df2.loc[0] = df2['Jan'].append(Total) + df_final = pd.concat([df, df2]) + df_final['total'] = df_final['total'].astype(int).apply(lambda x: '{:,}'.format(x)) + df_final['Jan'] = df_final['Jan'].astype(int).apply(lambda x: '{:,}'.format(x)) + df_final['Feb'] = df_final['Feb'].astype(int).apply(lambda x: '{:,}'.format(x)) + df_final['Mar'] = df_final['Mar'].astype(int).apply(lambda x: '{:,}'.format(x)) + df_final=df_final.applymap(lambda x: '$'+ str(x)) + df_final=df_final.rename(index={0: 'Total'}) + return df_final + +q08_append_subtotals(path1,path2) + + diff --git a/q08_append_subtotals/tests/__pycache__/__init__.cpython-36.pyc b/q08_append_subtotals/tests/__pycache__/__init__.cpython-36.pyc index 21f4cd0cdb2d982e41dd3fb8f998360de650cdd0..786d61bd5b16e04222e657ca90976cae60de9184 100644 GIT binary patch delta 50 zcmX@WxR#N_n3tF9<)-}Ti5%u~QTiGAxvBcW8Hq(Hr8!>u;rT_`#RZAUsrt$JDX9|+ F0sy8C5t#r0 delta 69 zcmZ3>cz}_^n3tF9__2dg6FJNcbM-@uQ;UlA6O%GBi!)NQi%XM=5_1#tG86OkT~dp) ZOY#f!^9xe*;tPuMvr>~wiYLYf003nj8WsQm diff --git a/q08_append_subtotals/tests/__pycache__/tests.cpython-36.pyc b/q08_append_subtotals/tests/__pycache__/tests.cpython-36.pyc index da1ab93cde97498d1677c07a0db5dd9f0d819fda..a6fee463e4303aca5754ec7fd439da7b30be6c4c 100644 GIT binary patch delta 53 zcmZ20I7^Vjn3tF9<)-}TjT{0@a^dQb`iV&ynZ+5Y*~O(vMTxnId6|iM`Yx%( b*(Lb}`uPQ^dGQ5B`B|ySCB>V~m{QmPYd0BO