From a4f34629a321bb30bd3bd8de38d2df70bc890867 Mon Sep 17 00:00:00 2001 From: sonik8494 Date: Sun, 19 Aug 2018 10:10:29 +0000 Subject: [PATCH 1/6] Done --- __pycache__/__init__.cpython-36.pyc | Bin 165 -> 147 bytes .../__pycache__/__init__.cpython-36.pyc | Bin 179 -> 161 bytes .../__pycache__/build.cpython-36.pyc | Bin 568 -> 467 bytes q01_load_data/build.py | 14 ++++++++++++-- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 185 -> 167 bytes .../tests/__pycache__/tests.cpython-36.pyc | Bin 1577 -> 1559 bytes 6 files changed, 12 insertions(+), 2 deletions(-) diff --git a/__pycache__/__init__.cpython-36.pyc b/__pycache__/__init__.cpython-36.pyc index b4b72099455159189764a0ad76aa1fabbc62e96a..fefd49bd30b5774f017d0a3f9bc540aa5b11c0e7 100644 GIT binary patch delta 51 zcmZ3=IGK^dn3tD}$*D4WB8R!WgMLPSZmNE9eqLs_g^8t!et3RSc5y*sa;koEeoE@Z G0#g8LcMrn= delta 69 zcmbQtxRjB@n3tD}Z`Piui5%vJLHeP^sYS*5iAfom#TlvD#idC_iMfe+nTdJ&E~&-Y YCHV#V`30$Y@dZWsS*gh-#S`O90UFa7!TBb5Z#YEybw`J@gH0Pr;!2^VvHsh8fh#{&VnpA8{jzDb9aegu)@|K;$Pa< zioamx?Ahof^D;YcGVkr2H5zq(wSKBoLcYkKU|3&bnj-`tKns#mU?~F*!8=Jg&<7HS zJ7me=wFSb8M6NPfv@Y0P`Bt^bjn`>4t3S8{N>Haokw#!a}`BjrDRKGZ&P?PF&!fe-eFwQ{Q*VM9pPl)M7g8b9A0!R~==voEFe2*RJueAL4!!ArM+;O?u39 m6YDr|wcn-Mb9&!{Cn`UG;1GK*>dzG{3whzcWc+a>7SJF3_;cO> literal 568 zcmY*WPfIH?5TERJ>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..af23d97 100644 --- a/q01_load_data/build.py +++ b/q01_load_data/build.py @@ -1,5 +1,15 @@ +# %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" + data = pd.read_excel(path) + + data['state'] = data.state.str.lower() + data['total'] = data[['Jan','Feb','Mar']].sum(axis=1) + + return data + + + + diff --git a/q01_load_data/tests/__pycache__/__init__.cpython-36.pyc b/q01_load_data/tests/__pycache__/__init__.cpython-36.pyc index 2a2dfc72b54611f7a4f5a7734a9c697f606c0089..d6ca98aaead97283cb52538cf311ff1550728539 100644 GIT binary patch delta 51 zcmdnVxSWy0n3tD}#i=rSB8Rzrh<-+XZmNE9eqLs_g^8t!et3RSc5y*sa;koEeoE@Z G0#5*SR}d8d 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..a1757a289c8d823b942bcbc76700fe99837e1127 100644 GIT binary patch delta 54 zcmZ3=#N<@{ J&BjdMm;t(E5rY5# delta 72 zcmbQvvyz9yn3tF9-|Rh68##V48Yb(97N-^!>nA2AR#B cXP4v`=;s%t=EWBj Date: Sun, 19 Aug 2018 10:55:38 +0000 Subject: [PATCH 2/6] Done --- .../__pycache__/__init__.cpython-36.pyc | Bin 180 -> 162 bytes .../__pycache__/build.cpython-36.pyc | Bin 626 -> 682 bytes q02_append_row/build.py | 15 ++++++++++++++- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 186 -> 168 bytes .../tests/__pycache__/tests.cpython-36.pyc | Bin 1355 -> 1337 bytes 5 files changed, 14 insertions(+), 1 deletion(-) diff --git a/q02_append_row/__pycache__/__init__.cpython-36.pyc b/q02_append_row/__pycache__/__init__.cpython-36.pyc index de0cf6163be25541da218f6f8a0c4d005729c09c..a893fa89d95624b00e37afcc3f73cd85eac8c2a7 100644 GIT binary patch delta 51 zcmdnOxQLO%n3tD}$*D4WB8R!WzkWu3ZmNE9eqLs_g^8t!et3RSc5y*sa;koEeoE@Z G0v7;sU=RNQ 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..f3e27b07c2f84dcece9362907c9f612f5832416b 100644 GIT binary patch delta 480 zcmYjNJ8K*<5Y}k551YGS5;ul)t~TIo!X3nc#2D-Z48~0g!=*Ts9o=(ZUhR>y(Q(DO zO<`Q*H^hG=|3Pgkx2ZxZkIWU8_=fMB(Y*9m-1)nmc6)PrdinJoXY3Dqa!9j7g6`hz z#>-xS0{v^&3lYAsIJkE&&tkCci#KokSt+rPvXNIi&L(P}s%$SU^J>rO*YixzQ*bGC zB0@+wBIp5`h8ebk1sFisVG~%f1t-qe+#~+UTMI!#thsNv@r*G3Pz+%a7?|+Jn+Ovi zC8LL8NF)E?R5~=F8~WyVXBnntHp>eg`?cH9dU}@IKvtD1(DDlH#xYI&xt6(#BP%M| zj4a221!>`%h13G}qHL_2exbhiA{_Jw<3eV?SpA&J{Xb1cWv&uk7USuD_kA}xFYBqU zWU7+1M3vnBgpaQ_+~!+km={57eV@TgsJF>SZG%b{D0RJg`wvd`TjYF9jiG>9i$UtN`mnO7Huu~PGL=3Pppne66 z`~g3~;FXD$k%A>9zqvnRbEnf;JpcTN-hr_%HW!@gJ%Z`IYz7Y~o>=4| zoUp+CZdAts*v@TlJ09f{W0a-5q6z=u5;xczK*d z@&fI`0m%-v94iZ_){{k{G7MZR3Rw;<$3fI0X{_@pEi{O!j(p04B$K08rk82h??rfK zls2Kf942O{Zp`FTZ^*IC5}Abu%G{KB5#}^FE_9x%tJ2IqV0Ww4Y`jRsxDTtaL`SdC qEofPH49?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..4ebb92f914a765937626b3126df68b19fa7b76e4 100644 GIT binary patch delta 54 zcmX@jwUdj(n3tD}$*D4WBga`r`5^s_{M=Oi;{3eKYzq@h6aDb~qU_>=#N<@{ J&1_7r%mBWD5VrsT delta 72 zcmdnVb()LAn3tDJY{8zWjT~ng4O8?(i&Kk=^%IjaGK(`(vx`fUiV|}Z^D-0j^j%Vm cvrF;|^z#c+^WqDN^0QKtONuvtVRU5%0G+5B!vFvP From 0be638670587b8521079cf08c1a7342e75382932 Mon Sep 17 00:00:00 2001 From: sonik8494 Date: Tue, 21 Aug 2018 09:22:48 +0000 Subject: [PATCH 3/6] Done --- .../__pycache__/__init__.cpython-36.pyc | Bin 182 -> 164 bytes .../__pycache__/build.cpython-36.pyc | Bin 888 -> 761 bytes q03_scrape_clean/build.py | 14 +++- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 188 -> 170 bytes .../tests/__pycache__/tests.cpython-36.pyc | Bin 1396 -> 1378 bytes scrapeddata.csv | 78 ++++++++++++++++++ 6 files changed, 90 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..56206fddb9ca80b98ffc802272ee1328ac304249 100644 GIT binary patch delta 51 zcmdnSxP+0zn3tD}$*D4WB8RzrpngVvZmNE9eqLs_g^8t!et3RSc5y*sa;koEeoE@Z G0yhA2ZV(3m 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`P)05NnKF#rGn diff --git a/q03_scrape_clean/__pycache__/build.cpython-36.pyc b/q03_scrape_clean/__pycache__/build.cpython-36.pyc index cdec2c4c90379271521fc76a792f2606530a2690..8cd371b9054cb4e0a4fbc6b48291ccfaa73c8d43 100644 GIT binary patch literal 761 zcmZ8eJ#X7E5G5&DmcNoL1=6MP>P0G$3~dnvExHv&mLM&l4g#&CW7?9akW_-W$&{}7 zA^km_%C%GeLZ=>O4?!v1Bk!nt_wIN!nGApZ{{F4U2>C;vtq{-e(aaYFAV5o!(QaoM z>-HcEx;@N7!B)LhBm%^KhcV*df%=aUVA&7?2!D`lBt~M`#ppSi^`4NMoNZ2*);8u{ znu z+p0F3eN$+T0|0J$Qkd&m*Y&Zl`hhv=9S1It8$+e zx&X6wzrrFLdA@w1O4Rq0XfOTmS-Mn}NR6uH`pxm%JHoOLI^2=6& zfE-&~iNdB=uaEMr#=Iy6uhV%eOGuhqckusJj8)7Kfv_<Ir(Yv5U6kx{t04 z%&l=unJnJ5Xk6HEyL1t6aM0kwm6EmVgVerB7Zt6>vmRh_N7(iA491={KB*M6r8xET QGCma30~*s;ETr+^A9(1|Q2+n{ 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$VRASJ~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..a44ca769cdf2fb60bd7fa2a40f9ee363cca14341 100644 GIT binary patch delta 54 zcmeyu^@xkZn3tD}$*D4WBgYp;`4Ih#{M=Oi;{3eKYzq@h6aDb~qU_>=#N<@{ J&ALqP%mCI@5nBKN delta 72 zcmaFF^@WSWn3tC;bkUxujT~PX4b${Pi&Kk=^%IjaGK(`(vx`fUiV|}Z^D-0j^j%Vm cvrF;|^z#c+^WqDN^0QKtONuv3Gr2PZ0Lmd6sQ>@~ diff --git a/scrapeddata.csv b/scrapeddata.csv new file mode 100644 index 0000000..8f8c794 --- /dev/null +++ b/scrapeddata.csv @@ -0,0 +1,78 @@ +,UnitedStatesofAmerica,Federal state,".mw-parser-output .monospaced{font-family:monospace,monospace}USUSA840",US,00,Unnamed: 5,Unnamed: 6,U.S.,U.S..1,U.S.A.,Unnamed: 10,Unnamed: 11,Unnamed: 12,Unnamed: 13,Unnamed: 14 +0,Alabama,State,US-AL,AL,1.0,AL,AL,Ala.,Ala.,,,,,, +1,Alaska,State,US-AK,AK,2.0,AK,AK,Alaska,Alaska,Alas.,,,,, +2,Arizona,State,US-AZ,AZ,4.0,AZ,AZ,Ariz.,Ariz.,Az.,,,,, +3,Arkansas,State,US-AR,AR,5.0,AR,AR,Ark.,Ark.,,,,,, +4,California,State,US-CA,CA,6.0,CA,CF,Calif.,Calif.,"Ca., Cal.",,,,, +5,Colorado,State,US-CO,CO,8.0,CO,CL,Colo.,Colo.,Col.,,,,, +6,Connecticut,State,US-CT,CT,9.0,CT,CT,Conn.,Conn.,Ct.,,,,, +7,Delaware,State,US-DE,DE,10.0,DE,DL,Del.,Del.,De.,,,,, +8,District of Columbia,Federal district,US-DC,DC,11.0,DC,DC,D.C.,D.C.,Wash. D.C.,,,,, +9,Florida,State,US-FL,FL,12.0,FL,FL,Fla.,Fla.,"Fl., Flor.",,,,, +10,Georgia,State,US-GA,GA,13.0,GA,GA,Ga.,Ga.,Geo.,,,,, +11,Hawaii,State,US-HI,HI,15.0,HI,HA,Hawaii,Hawaii,H.I.,,,,, +12,Idaho,State,US-ID,ID,16.0,ID,ID,Idaho,Idaho,"Id., Ida.",,,,, +13,Illinois,State,US-IL,IL,17.0,IL,IL,Ill.,Ill.,"Il., Ills., Ill's",,,,, +14,Indiana,State,US-IN,IN,18.0,IN,IN,Ind.,Ind.,In.,,,,, +15,Iowa,State,US-IA,IA,19.0,IA,IA,Iowa,Iowa,"Ia., Ioa.[1]",,,,, +16,Kansas,State,US-KS,KS,20.0,KS,KA,Kans.,Kan.,"Ks., Ka.",,,,, +17,Kentucky,State (Commonwealth),US-KY,KY,21.0,KY,KY,Ky.,Ky.,"Ken., Kent.",,,,, +18,Louisiana,State,US-LA,LA,22.0,LA,LA,La.,La.,,,,,, +19,Maine,State,US-ME,ME,23.0,ME,ME,Maine,Maine,Me.,,,,, +20,Maryland,State,US-MD,MD,24.0,MD,MD,Md.,Md.,,,,,, +21,Massachusetts,State (Commonwealth),US-MA,MA,25.0,MA,MS,Mass.,Mass.,,,,,, +22,Michigan,State,US-MI,MI,26.0,MI,MC,Mich.,Mich.,,,,,, +23,Minnesota,State,US-MN,MN,27.0,MN,MN,Minn.,Minn.,Mn.,,,,, +24,Mississippi,State,US-MS,MS,28.0,MS,MI,Miss.,Miss.,,,,,, +25,Missouri,State,US-MO,MO,29.0,MO,MO,Mo.,Mo.,,,,,, +26,Montana,State,US-MT,MT,30.0,MT,MT,Mont.,Mont.,,,,,, +27,Nebraska,State,US-NE,NE,31.0,NE,NB,Nebr.,Neb.,,,,,, +28,Nevada,State,US-NV,NV,32.0,NV,NV,Nev.,Nev.,Nv.,,,,, +29,New Hampshire,State,US-NH,NH,33.0,NH,NH,N.H.,N.H.,,,,,, +30,New Jersey,State,US-NJ,NJ,34.0,NJ,NJ,N.J.,N.J.,N.Jersey,,,,, +31,New Mexico,State,US-NM,NM,35.0,NM,NM,N. Mex.,N.M.,New M.,,,,, +32,New York,State,US-NY,NY,36.0,NY,NY,N.Y.,N.Y.,N. York,,,,, +33,North Carolina,State,US-NC,NC,37.0,NC,NC,N.C.,N.C.,N. Car.,,,,, +34,North Dakota,State,US-ND,ND,38.0,ND,ND,N. Dak.,N.D.,NoDak,,,,, +35,Ohio,State,US-OH,OH,39.0,OH,OH,Ohio,Ohio,"O., Oh.",,,,, +36,Oklahoma,State,US-OK,OK,40.0,OK,OK,Okla.,Okla.,Ok.,,,,, +37,Oregon,State,US-OR,OR,41.0,OR,OR,Oreg.,Ore.,Or.,,,,, +38,Pennsylvania,State (Commonwealth),US-PA,PA,42.0,PA,PA,Pa.,Pa.,"Penn., Penna.",,,,, +39,Rhode Island,State,US-RI,RI,44.0,RI,RI,R.I.,R.I.,"R.I. & P.P., R. Isl.",,,,, +40,South Carolina,State,US-SC,SC,45.0,SC,SC,S.C.,S.C.,S. Car.,,,,, +41,South Dakota,State,US-SD,SD,46.0,SD,SD,S. Dak.,S.D.,SoDak,,,,, +42,Tennessee,State,US-TN,TN,47.0,TN,TN,Tenn.,Tenn.,,,,,, +43,Texas,State,US-TX,TX,48.0,TX,TX,Tex.,Texas,Tx.,,,,, +44,Utah,State,US-UT,UT,49.0,UT,UT,Utah,Utah,Ut.,,,,, +45,Vermont,State,US-VT,VT,50.0,VT,VT,Vt.,Vt.,,,,,, +46,Virginia,State (Commonwealth),US-VA,VA,51.0,VA,VA,Va.,Va.,Virg.,,,,, +47,Washington,State,US-WA,WA,53.0,WA,WN,Wash.,Wash.,"Wa., Wn.[2]",,,,, +48,West Virginia,State,US-WV,WV,54.0,WV,WV,W. Va.,W.Va.,"W.V., W. Virg.",,,,, +49,Wisconsin,State,US-WI,WI,55.0,WI,WS,Wis.,Wis.,"Wi., Wisc.",,,,, +50,Wyoming,State,US-WY,WY,56.0,WY,WY,Wyo.,Wyo.,Wy.,,,,, +51,American Samoa,Insular area (Territory),ASASM016US-AS,AS,60.0,AS,AS,A.S.,,,,,,, +52,Guam,Insular area (Territory),GUGUM316US-GU,GU,66.0,GU,GU,Guam,,,,,,, +53,Northern Mariana Islands,Insular area (Commonwealth),MPMNP580US-MP,MP,69.0,MP,CM,M.P.,,CNMI[3],,,,, +54,Puerto Rico,Insular area (Territory),PRPRI630US-PR,PR,72.0,PR,PR,P.R.,,,,,,, +55,U.S. Virgin Islands,Insular area (Territory),VIVIR850US-VI,VI,78.0,VI,VI,V.I.,,U.S.V.I.,,,,, +56,U.S. Minor Outlying Islands,Insular areas,UMUMI581US-UM,UM,74.0,,,,,,,,,, +57,Baker Island,island,UM-81,,81.0,,,,,XB[4],,,,, +58,Howland Island,island,UM-84,,84.0,,,,,XH[4],,,,, +59,Jarvis Island,island,UM-86,,86.0,,,,,XQ[4],,,,, +60,Johnston Atoll,atoll,UM-67,,67.0,,,,,XU[4],,,,, +61,Kingman Reef,atoll,UM-89,,89.0,,,,,XM[4],,,,, +62,Midway Islands,atoll,UM-71,,71.0,,,,,QM[4],,,,, +63,Navassa Island,island,UM-76,,76.0,,,,,XV[4],,,,, +64,Palmyra Atoll[5],atoll[5],UM-95,,95.0,,,,,XL[4],,,,, +65,Wake Island,atoll,UM-79,,79.0,,,,,QW[4],,,,, +66,Micronesia,Freely associated state,FMFSM583,FM,64.0,FM,,,,,,,,, +67,Marshall Islands,Freely associated state,MHMHL584,MH,68.0,MH,,,,,,,,, +68,Palau,Freely associated state,PWPLW585,PW,70.0,PW,,,,,,,,, +69,U.S. Armed Forces – Americas[6],US military mail code,,,,AA,,,,,,,,, +70,U.S. Armed Forces – Europe[7],US military mail code,,,,AE,,,,,,,,, +71,U.S. Armed Forces – Pacific[8],US military mail code,,,,AP,,,,,,,,, +72,Northern Mariana Islands,Obsolete postal code[9],,,,CM,,,,,,,,, +73,Panama Canal Zone,Obsolete postal code,PZPCZ594,,,CZ,,,,,,,,, +74,Nebraska,Obsolete postal code[10],,,,NB,,,,,,,,, +75,Philippine Islands,Obsolete postal code,PHPHL608[11],,,PI,,,,,,,,, +76,Trust Territory of the Pacific Islands,Obsolete postal code,PCPCI582,,,TT,,,,,,,,, From 74b8ca0af06225d32984361f322a07ba61bee747 Mon Sep 17 00:00:00 2001 From: sonik8494 Date: Mon, 27 Aug 2018 04:18:35 +0000 Subject: [PATCH 4/6] Done --- .../__pycache__/build.cpython-36.pyc | Bin 467 -> 467 bytes .../__pycache__/__init__.cpython-36.pyc | Bin 177 -> 159 bytes q04_mapping/__pycache__/build.cpython-36.pyc | Bin 877 -> 1486 bytes q04_mapping/build.py | 35 +++++++++++++++++- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 183 -> 165 bytes .../tests/__pycache__/test.cpython-36.pyc | Bin 1685 -> 1667 bytes 6 files changed, 33 insertions(+), 2 deletions(-) diff --git a/q01_load_data/__pycache__/build.cpython-36.pyc b/q01_load_data/__pycache__/build.cpython-36.pyc index 01387a1f825441e1ba6e784cdfa6f965ebc68b2a..aacf235bcf14e7dd8ee2b8a2ea02ce993de84428 100644 GIT binary patch delta 116 zcmcc2e3_Zmn3tDJcp~dLky|W@6`94iSWEIt5_2@!ZZQ?4+?x2@h*4m&6l0->5Ca2) yCd)0hg2cR(#Nr}OAh(DQM1UlU1W*YTZlX-=vg6OdQT0wg$?SQr6EuNsX2 delta 116 zcmcc2e3_Zmn3tD}c_QmMktmkLip=6$tR?v+i8-2Vx0ni2q9#5!V&t1F#aQSez`($u y$#RRWATci`vABo>$SvXl5g>^oK2(Aq$i2m3lbfGXnv-hB1mqR700|Bz7DfQ!F&S(C diff --git a/q04_mapping/__pycache__/__init__.cpython-36.pyc b/q04_mapping/__pycache__/__init__.cpython-36.pyc index ee0618f2c89597e870d478c12dab4aec6d95e7c7..2f31610ad50cb21dd1ae041cb1018767813fdbc0 100644 GIT binary patch delta 51 zcmdnUIG>Tjn3tD}$*D4WB8R!WkA6meZmNE9eqLs_g^8t!et3RSc5y*sa;koEeoE@Z G0!ILF%MbGa 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..47d4311bb6f3bf1d5dd2a2b0eab1aa44e9c59cf8 100644 GIT binary patch literal 1486 zcmZuxOK;>v5blTV@pv9PyIN3!1PTWZKI}|(iO?cN2n1RQBy!2FkeY+#arb2H^();y zn@Mmk4A=Yv{s4ceublE1I8o&xQ9!t-tE#*DQT6p#^Z8^F{rb!H=aEmypX9;kf&Ddf zvjHKAq$Lrw*G#ZpbHRJ<316`yCWgrHWw4=iK+Bu@EZ}2 zPwJi3M3$w^Gz^!)HelD4g?Wulvlt9_Z;bfGqxDxYOd z)jq@Vd{dgu)vR}!OsB1q^US=@D4qfzgN})P3*Ec~VM#$dvZdFwqXjE?;cZDrB|S#T zB$wV9-zSBS;oiU+IY18t7M?iY*wiY=e@JV`U#X?zKc@N?uZpSg(oJrhZyTGIao|`h zU8GeilRje2VU^>?YUh{Dh0FfVFG^;J%d$$eZP3yRBBa<+x~>+#YEyv7rCfC6uhseT0NH2^lw&+102B(J5~#6cg6p5Q`^(+$6ah+pZn zQjWfM!Hx*Auczo_awP@;AQD3aa+QEBLeQ(cPRky~op_ArAqfy!6M-Nsq)+J-T0ftm z6F&^`KKtKcaL*J57VCi6kSCWE5a8C^Lf(ZB+<_Tj2$$?`9&MZ{0ttJH!4`^PpCBql zDEXFlp7g+vBflR7$HWeMr2Wn>A}kO)Dxg4aI3=AgBRF}|!HsCcP9MwUK<=DJ26 z2H9GJExtI@>N2%WRp!h2|5oGt-~V0nz99Sb^#NY-DGDsUKB@;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*;#g03R~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..81ba5d001a4ddcd7bd7c4a801b7f59da832a5f05 100644 GIT binary patch delta 54 zcmbQr+sw;h%*)Hgfd|yq|tXer~FMaeiKAwuOnMiGFx~QFd`bVsff}a(+tc JW(B5F767e`5V8OO delta 72 zcmZqXoyyB$%*)H=vv*I_MvmuQb`iV&ynZ+5Y*~O(vMTxnId6|iM`Yx%( b*(Lb}`uPQ^dGQ5B`B|ySCB>Whm`Ygymu4Cg From 2a0dd9e6e8b6b763fe0e15491926ddded2757e77 Mon Sep 17 00:00:00 2001 From: sonik8494 Date: Mon, 27 Aug 2018 05:53:00 +0000 Subject: [PATCH 5/6] Done --- .../__pycache__/build.cpython-36.pyc | Bin 682 -> 682 bytes .../__pycache__/__init__.cpython-36.pyc | Bin 192 -> 174 bytes .../__pycache__/build.cpython-36.pyc | Bin 808 -> 1808 bytes q05_replace_missing_values/build.py | 43 +++++++++++++++++- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 198 -> 180 bytes .../tests/__pycache__/tests.cpython-36.pyc | Bin 1741 -> 1723 bytes 6 files changed, 42 insertions(+), 1 deletion(-) diff --git a/q02_append_row/__pycache__/build.cpython-36.pyc b/q02_append_row/__pycache__/build.cpython-36.pyc index f3e27b07c2f84dcece9362907c9f612f5832416b..7a6ac4622f5fd1fcc8af37988b7282938a4f4616 100644 GIT binary patch delta 65 zcmZ3*x{8(6n3tDpKgL;wH) delta 65 zcmZ3*x{8(6n3tC;dn0Q%BVQCpN?LqcW?o{>N`@k#$@3Vi8AT>bF~y3CFfafGPzmA5 HJxp={8Dy-n3tD}$*D4WB8Rzrw0=f@ZmNE9eqLs_g^8t!et3RSc5y*sa;koEeoE@Z Gf&c(`v=A=< delta 69 zcmZ3-cz}_^n3tE!f7YI;i5%vJx%#2SsYS*5iAfom#TlvD#idC_iMfe+nTdJ&E~&-Y YCHV#V`30$Y@dZWsS*gh-#S`NK06qR0ZvX%Q diff --git a/q05_replace_missing_values/__pycache__/build.cpython-36.pyc b/q05_replace_missing_values/__pycache__/build.cpython-36.pyc index 6a32964667ab0d808d5677d1ae67893cfb4e2b10..e6e89295eef352e2baf83e2eb876e457f647096b 100644 GIT binary patch literal 1808 zcmZ`)OK;>v5O%kp^9o^E!6qPBI3QVQGua2yB1H%U+5^(&l3jt!!Sc9!vi5pxr`xle zten%pF$eDa0j~U##lOhV=eH;IIo41_O&Uz}tpLJ^@KiGdiR55-7~ z(U0X=Msl#?*ujpRcyft*oWq!z(aHX!bdj}fQ6InA5m}c_9S&9?BW4`AiQ9eT*y4G_P>*l>tL<2?hLTzoDA7;fjS072=4RTu$xT*0r$ zNvDxA5ZF_OE9A z8%f7bA3%=|-`sg#7o8M$kBF}NZZp68?Lw*|&l3LpC>dFHfFMY#WVkVkWYEdFmRd`h zL{P1ENgoex&t@uijaxOj3G${|E^6ajc3EP_TQ*3FP)s7rdL&^IWV$TMlxgQuH7=Xpj2$E1x53 z6y}mc1Dx}pA=bj^W;i0;Nn=c7R!=D`*{`4s3 zcFYRspJQsRN7nx}@bA$EuRwSd(b(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..e98bcab 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 @@ -7,7 +8,47 @@ path1 = 'data/excel-comp-data.xlsx' path2 = 'data/scraped.csv' +# def q05_replace_missing_values(path1,path2): +def q01_load_data(path): + data = pd.read_excel(path) + + data['state'] = data.state.str.lower() + data['total'] = data[['Jan','Feb','Mar']].sum(axis=1) + + return data + +def q02_append_row(path): + + df = q01_load_data(path) + sum_row = df[['Jan', 'Feb', 'Mar', 'total']].sum() + df_sum = pd.DataFrame(data=sum_row).T + df_final = df.append(df_sum,ignore_index = True) + return df_final +def q04_mapping(path1,path2): + + a = pd.read_excel(path1) + b = pd.read_csv(path2) + b['United States of America'] = b['United States of America'].astype(str).str.lower() + b['US'] = b['US'].astype(str) + mapping = b.set_index('United States of America').to_dict()['US'] + mapping['mississipi']=mapping.pop('mississippi') + mapping['tenessee']=mapping.pop('tennessee') + new_df = q02_append_row(path1) +# new['abbr'] = np.nan + new_df.insert(loc = 6,column = 'abbr', value = np.nan) + new_df['state'] = new_df['state'].map(mapping) + return new_df def q05_replace_missing_values(path1,path2): + df_replace = q04_mapping(path1,path2) + df_mississippi = pd.DataFrame(df_replace.iloc[6,:]).T + df_tenessee = pd.DataFrame(df_replace.iloc[10,:]).T + df_tenessee = df_tenessee.replace(np.nan,'TN') + df_mississippi = df_mississippi.replace(np.nan,'MS') + df_replace.iloc[6,6] = 'MS' + df_replace.iloc[10,6] = 'TN' + return df_replace + +q05_replace_missing_values(path1,path2) +#print(q05_replace_missing_values(path1,path2).shape) -#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..8826a7dbc1d343ce8c3be55354043e2c4088294c 100644 GIT binary patch delta 51 zcmX@cxP_6!n3tD}$*D4WB8RzrqJBnxZmNE9eqLs_g^8t!et3RSc5y*sa;koEeoE@Z Gf-nGk-VjFs delta 69 zcmdnOc#M(5n3tC;e(#>Bi5%vJ#rmPesYS*5iAfom#TlvD#idC_iMfe+nTdJ&E~&-Y YCHV#V`30$Y@dZWsS*gh-#S`Pg08Tv_x&QzG 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..a6f3ab6ae4fa8d83faf93739aca17fd1d8784889 100644 GIT binary patch delta 54 zcmX@hyPKE8n3tD}$*D4WBL^Fke4Ktper~FMaeiKAwuOnMiGFx~QFd`bVsff}a(+tc JW_zYS767G*5Q+c* delta 72 zcmdnZdzP2On3tDp?!G-y8#&mR3=8x_i&Kk=^%IjaGK(`(vx`fUiV|}Z^D-0j^j%Vm cvrF;|^z#c+^WqDN^0QKtONuw^GWD?l0G!YoJOBUy From 60199b6f7c64c3b130bf6c5c88fe567df327bd3a Mon Sep 17 00:00:00 2001 From: sonik8494 Date: Tue, 28 Aug 2018 08:03:14 +0000 Subject: [PATCH 6/6] Done --- q04_mapping/__pycache__/build.cpython-36.pyc | Bin 1486 -> 1486 bytes .../__pycache__/__init__.cpython-36.pyc | Bin 179 -> 161 bytes .../__pycache__/build.cpython-36.pyc | Bin 740 -> 2080 bytes q06_sub_total/build.py | 46 +++++++++++++++++- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 185 -> 167 bytes .../tests/__pycache__/test.cpython-36.pyc | Bin 1424 -> 1406 bytes 6 files changed, 45 insertions(+), 1 deletion(-) diff --git a/q04_mapping/__pycache__/build.cpython-36.pyc b/q04_mapping/__pycache__/build.cpython-36.pyc index 47d4311bb6f3bf1d5dd2a2b0eab1aa44e9c59cf8..ee89387d21f24853154356635faab15ea0797683 100644 GIT binary patch delta 397 zcmYjNOHRWu5RF3&+X_==nXbl2sC1cDwP%cksX%+9|tb1N+G;Hncr|_8xhjmon(P zGD#VBiWgOZ%nBvsTN=X9-9wKcc7V|hulXJDQX-pR$hDSAqyg;F&=)!Gnt7Q)wZKs1 znd8`YH7^vO!GKg6*eB*Y=zI3pUtgpD^oU7W7(++v0^|Rtz^Il=Nn@nMwxbPOhxDL5 zY8_vYFG#3ugXAK6Hm}Z@sh3(phh|-xMMl<}P-s=_{s2QI7n#VnUD==3cy#5q(*cH> tE5Xes^^RE@^ecmbnwNSB=Ojy!;n1E2(~}X=F+uZPB(bHtiEO`uvp*7xZ*Kqq delta 397 zcmYjNOHRWu5RF4)lBO+f1sfzJ5FimYfY@*VK6@xqHJix74vN$`mYud_g~S!SXT=3L z2AdurH|P=A;b|pQ$$Im~Z~QdRi+B+S*WGUW<2!gH1nijHk-q&TB^lbDKY0&5&r68j zab=Vc=;W`m)FRC#7jFsGLwB#c2$6#(x@8r+*Q^i?88wtCB_vM*-9ypm8El(rk?L{| zlxL~q5W1S>l1+3UT~;ta<~!(n_SawDfdBjiagiH?N2wgz|4j~2C8QL_2mzs^E4HNW zHQ4>u@fGf++t`L$FrL1c8Bk`bS_vJa)YqFRRnD_ak{K&6vYxpGkeOEz&w2$n%lR?~lr9b)V+_^IV@_Y+9EdskD-!KhiHp zjCR4r(LA)D(DWm8wKHK0XUQ(vf=&3uop?)U!2~;?o(oraV|Uw`_`(;#6`m0xc@TJX zXnb9#wKVQ8X<^*Qa%kKqsk)}EdMx(R^GqARF6%V!1%_9`G?h$6Vk1@*gmHDPjGvch zQo){0d)#{W^G2PUS$CMRxLN|J(h+^HQDY3Xlv&rI3RvEkvr5 z@hlTkB$X;Ba#Rma_r6K=Y?#;p2E$pFi+(jXozuMsNnRoj+Mj<60ntYS(aP>ay z8?<~(s9CfQVAReUE3rn$13GN!T=E*|Ex7Qn*u=YZfu_H3i4<4-(pz{IF-0F!0d?S_ zqZ;UXOl@L#3dq{oxG0rOvO>u7USMNU6ryUPGmW1S@ne-vrD0D^kXDr}M9)_nkZ_5thSR@<13h%R(d z$TvXziOCIZI4r(kAdrjWGJxUM-VzW@d=LpMpo=T`dYx=qnFIpwOu{9qY}+A#CXsNL zY~cwHewz7q792Qr!-DQF{7F-UBC1=HwrE_r%vt!Ni7$5+*pY0!=>zE2;lD3Ds0pnQ7ikvba&pqL5lkX(E``x~9W}&cmVVxyH@Q zkqJg+KARTCx20&g-0RvTsTMsPS)!xv;vm)ayppPoWz`{HL(6)V;W(_zL}a7dxK&wM zz)g@9TB_RcqB3qlbu~>Zl#fqk@nAJPG%Pi2XhOIu2tphb@+=X@Zzs8Ry0@Rae&%Cr zttrh8Z?Y!aVs~&;o+D0{`U0MtZ2yP$1w2H1dhUF>DZBmAGy%IDN=(Q*d`bBhiw zOxHAc3tdG&k1x?QrIt|L!F?CE_1s`dI!6Su5<=13#&Rtp!XNvDrmYDMF+nW>hv0B^ z+;^#lYqv4sSe3JCIJYv<^WL1t_}24U3Wje*PcnE*9`_NKrYIqU>>g7CSiMaXtd!Lf zJNAp&w3=H8;}7*oE>l(Xr_kR#(K3hPB1MYy0!lvDhL<}2ajfJ#t;=bi4g2p@>Hh!! z-}+Xv?J3`!Y9)yzO*XSO&|62N--WUQ7abt9SuVe$h&1sfVi9YjMZC>D=DAT6g;6(Z GME<{dKk$P9 delta 359 zcmYjLyGjE=6rG)YWQkcxX<-paAzLj`5DO6tVrUJ?yEEfF2(j@S!uDe8 zXZRJuG#2^~f|Yk;lMCnEd+y_KU;E$w@F0r1KOgUDi4poj8vz=f0@P$RocPW)io?~* ztTDm(`Dte%OHBt$Zsb7m%IK1_K|v)=J(6Y8x)+35_nc5g0P$@i$$LL%+z9O uF%!*I=W*PH4Y}1)ySx5lgCgkJ@VMr=spyFVO7($4Cvc=!*LSYy)w diff --git a/q06_sub_total/build.py b/q06_sub_total/build.py index c420838..12e2c2d 100644 --- a/q06_sub_total/build.py +++ b/q06_sub_total/build.py @@ -1,3 +1,4 @@ +# %load q06_sub_total/build.py import pandas as pd import numpy as np from sklearn.model_selection import train_test_split @@ -9,8 +10,51 @@ path1 = 'data/excel-comp-data.xlsx' path2 = 'data/scraped.csv' +# def q06_sub_total(path1,path2): +def q01_load_data(path): + data = pd.read_excel(path) + + data['state'] = data.state.str.lower() + data['total'] = data[['Jan','Feb','Mar']].sum(axis=1) + + return data + +def q02_append_row(path): + + df = q01_load_data(path) + sum_row = df[['Jan', 'Feb', 'Mar', 'total']].sum() + df_sum = pd.DataFrame(data=sum_row).T + df_final = df.append(df_sum,ignore_index = True) + return df_final +def q04_mapping(path1,path2): + + a = pd.read_excel(path1) + b = pd.read_csv(path2) + b['United States of America'] = b['United States of America'].astype(str).str.lower() + b['US'] = b['US'].astype(str) + mapping = b.set_index('United States of America').to_dict()['US'] + mapping['mississipi']=mapping.pop('mississippi') + mapping['tenessee']=mapping.pop('tennessee') + new_df = q02_append_row(path1) +# new['abbr'] = np.nan + new_df.insert(loc = 6,column = 'abbr', value = np.nan) + new_df['state'] = new_df['state'].map(mapping) + return new_df +def q05_replace_missing_values(path1,path2): + 'write your solution here' + df_final = q04_mapping(path1,path2) + df_mississipi = df_final[df_final['state'] == 'mississipi'].replace(np.nan, 'MS') + df_tenessee = df_final[df_final['state'] == 'tenessee'].replace(np.nan, 'TN') + df_final.replace(df_final.iloc[6], df_mississipi, inplace=True) + df_final.replace(df_final.iloc[10], df_tenessee, inplace=True) + return df_final + def q06_sub_total(path1,path2): - "write your solution here" + group = q05_replace_missing_values(path1,path2) + df_sub = group[['state', 'Jan', 'Feb', 'Mar', 'total']].groupby('state').sum() + return df_sub + +q06_sub_total(path1,path2) diff --git a/q06_sub_total/tests/__pycache__/__init__.cpython-36.pyc b/q06_sub_total/tests/__pycache__/__init__.cpython-36.pyc index 93ecd56b3c091f5989387358e77ebd2bb8ee90d7..0142677604b59800e895bdbfe7ba31d515ba7f8f 100644 GIT binary patch delta 51 zcmdnVxSWy0n3tD}$*D4WB8Rzrh<-+XZmNE9eqLs_g^8t!et3RSc5y*sa;koEeoE@Z G0#5*S0}vAc delta 69 zcmZ3^xRa5?n3tEUbpM{Hi5%vJY5JkXsYS*5iAfom#TlvD#idC_iMfe+nTdJ&E~&-Y YCHV#V`30$Y@dZWsS*gh-#S`N^0ZKv{o&W#< diff --git a/q06_sub_total/tests/__pycache__/test.cpython-36.pyc b/q06_sub_total/tests/__pycache__/test.cpython-36.pyc index 691280a23f33a47bb86c6a2aef8fba66bc436cb3..59cf38330ae0cbf440c182cc17b419d8fff71f8e 100644 GIT binary patch delta 54 zcmbQh{f~>on3tD}$*D4WBgaQZ`2hWl{M=Oi;{3eKYzq@h6aDb~qU_>=#N<@{ J&00)p%mBtt5h(xw delta 72 zcmeyzHG!MMn3tDp+krh%8#z8Q8Ybz77N-^!>nA2AR#B cXP4v`=;s%t=EWBj