From 01b2f42d4125364b40536e7d82d4032ed51f7222 Mon Sep 17 00:00:00 2001 From: Tusharshah2006 Date: Sat, 18 Aug 2018 02:40:42 +0000 Subject: [PATCH 01/13] Done --- __pycache__/__init__.cpython-36.pyc | Bin 165 -> 152 bytes .../__pycache__/__init__.cpython-36.pyc | Bin 179 -> 166 bytes .../__pycache__/build.cpython-36.pyc | Bin 568 -> 512 bytes q01_load_data/build.py | 13 +++++++++++-- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 185 -> 172 bytes .../tests/__pycache__/tests.cpython-36.pyc | Bin 1577 -> 1564 bytes 6 files changed, 11 insertions(+), 2 deletions(-) diff --git a/__pycache__/__init__.cpython-36.pyc b/__pycache__/__init__.cpython-36.pyc index b4b72099455159189764a0ad76aa1fabbc62e96a..c89ef72a6e01371702501ac39ebb84063c31b6e8 100644 GIT binary patch delta 56 zcmZ3=ID?VHn3tF9ds}(*L=JNmSN)9q+*JLL(&CK7A|TE%GB7aH56>^kE-pw+PSsD& KPf49vU^kE-pw+PSsD& KPf49v;0yo-i4!LP delta 69 zcmZ3+xS5f|n3tDJb=ID!i5%vJ3HqVMsYS*5iAfom#TlvD#idC_iMfe+nTdJ&E~&-Y YCHV#V`30$Y@dZWsS*gh-#S@dA0W0ts8vpdfP*?ZUQ}-QpmNKLJEP+VNrIJc(-z-NLu0s_vE^_ z{E+-5U3>CRNKP5K7iVA|^Tm6QIUNqO=fC%t2b7S1WG5KbUoqVw0uZ2zloVLWAOZe| zl!;6vTTzOebCRbUydu+w5eP2|xu~T&s`cC)#r}Aq+@eN-ZA4;@d4}n}A$Zc#C0Wtm zbV-4ZNXyz}MPfZcY&nXPH3Jl0vulR?6gZ@h@wzu5zK1vcXk;0U^rs6S4b9{PMk+>A5U^ba-JgXD8$F=i)-!pU#L{7PSUh7;y{2RX1G&5-MYLD{Eie zjXzaNql4|&uDV9SvH2B-Z{{hAxD0{NjDDaW5$${IavpmBX>A`{JB$z)TU$Hu4rgI7 TnQQ2j{1V^q;%^3w(?S0g)cJo! 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..8c5236f 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" + df = pd.read_excel(path) + df['state'] = df['state'].str.lower() + df['total'] = df.iloc[:,6:9].sum(axis=1) + + 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..440c350486dd160df05020e96b72b17118050174 100644 GIT binary patch delta 56 zcmdnVxQ3C#n3tF9S6g}XL=JP6Nd1ib+*JLL(&CK7A|TE%GB7aH56>^kE-pw+PSsD& KPf49v;0XW;niE0* delta 69 zcmZ3(xRa5?n3tD}ZT6n1i5%vJY5JkXsYS*5iAfom#TlvD#idC_iMfe+nTdJ&E~&-Y YCHV#V`30$Y@dZWsS*gh-#S@b~0V!1(6#xJL diff --git a/q01_load_data/tests/__pycache__/tests.cpython-36.pyc b/q01_load_data/tests/__pycache__/tests.cpython-36.pyc index 76e04c8a5e2c476c2fba795d8bae25fd09cc88ed..c40fafa5ae0540cc94e01d8ec2fa020620fb780e 100644 GIT binary patch delta 59 zcmZ3nA2AR#B cXP4v`=;s%t=EWBj~JdjJ3c From 503c39793a06d323ef77d2862664d5467724de75 Mon Sep 17 00:00:00 2001 From: Tusharshah2006 Date: Sat, 18 Aug 2018 03:34:21 +0000 Subject: [PATCH 02/13] Done --- .../__pycache__/__init__.cpython-36.pyc | Bin 180 -> 167 bytes .../__pycache__/build.cpython-36.pyc | Bin 626 -> 562 bytes q02_append_row/build.py | 7 ++++++- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 186 -> 173 bytes .../tests/__pycache__/tests.cpython-36.pyc | Bin 1355 -> 1342 bytes 5 files changed, 6 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..d0b7f049bcff50f43c324b5558222d2188a57fa5 100644 GIT binary patch delta 56 zcmdnOxSWy0n3tF9ds}(*L=JP65dDn&+*JLL(&CK7A|TE%GB7aH56>^kE-pw+PSsD& KPf49v-~s>!9}_D8 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@cV05A0!EdT%j diff --git a/q02_append_row/__pycache__/build.cpython-36.pyc b/q02_append_row/__pycache__/build.cpython-36.pyc index 508826776138177582df97d666bb284c1e1484b0..f4f2d51effb911aaf2909d59c7aeb1dd9ecb1f49 100644 GIT binary patch literal 562 zcmZuty>8nu5GE-~QPa5Snm4G1NN)Nw8AXBa0g46)zzzbVV`90K$&eCa7w+U_%#^3- zmgnKx$*+*9M|DYn9&q0sdARSsyLXex{=@zC_Zv#cAM(T)=AY613;_sGO#~ey6Ksr$ zNH8+ZyHuofJz&!t13A5W(rt25(%cqrFuB-E* z)lk}Xc=f#S0>}6$me8EOVeSC4A`jU=(!eaB%(V~9c=6%VskQ7)r`z-Lzf;R+2QSB= l*e*t{Yj`{!q literal 626 zcmZuuy>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..b86abd8 100644 --- a/q02_append_row/build.py +++ b/q02_append_row/build.py @@ -1,12 +1,17 @@ +# %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) + df.loc[len(df)] = df.iloc[:,6:10].sum(axis=0) + return df +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..5ef57e620b35b7bbe60c3639fe3fa7f50f134595 100644 GIT binary patch delta 56 zcmdnRxR#N_n3tF9ds}(*L=JP6DE*B5+*JLL(&CK7A|TE%GB7aH56>^kE-pw+PSsD& KPf49v-~|8)qZ2~_ delta 69 zcmZ3>xQmg)n3tEUXwIIfi5%vJ>H49?sYS*5iAfom#TlvD#idC_iMfe+nTdJ&E~&-Y YCHV#V`30$Y@dZWsS*gh-#S@dg07IP_h5!Hn diff --git a/q02_append_row/tests/__pycache__/tests.cpython-36.pyc b/q02_append_row/tests/__pycache__/tests.cpython-36.pyc index 742ee79571b722fe1fcab2f42f1dbcae23a14bd1..702cde949ddab44317674d16587bec191e71f0b5 100644 GIT binary patch delta 59 zcmX@jwU3L#n3tF9ds}(*Mvk+LD&hJW`MIh3A*IC`iA6x1VPs%nrXQYPlwDkqn4GGg NoS%}qnT^Sn8310k6XO5? delta 72 zcmdnTb()LAn3tDJY{8zWjT~ng4O8?(i&Kk=^%IjaGK(`(vx`fUiV|}Z^D-0j^j%Vm cvrF;|^z#c+^WqDN^0QKtONuxDWOQW)0G}ip%>V!Z From 6cf6e4c7a430afc5d74575731e0413e01aa005c7 Mon Sep 17 00:00:00 2001 From: Tusharshah2006 Date: Sat, 18 Aug 2018 04:06:30 +0000 Subject: [PATCH 03/13] Done --- .../__pycache__/__init__.cpython-36.pyc | Bin 182 -> 169 bytes .../__pycache__/build.cpython-36.pyc | Bin 888 -> 720 bytes q03_scrape_clean/build.py | 13 ++++++++++++- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 188 -> 175 bytes .../tests/__pycache__/tests.cpython-36.pyc | Bin 1396 -> 1383 bytes 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/q03_scrape_clean/__pycache__/__init__.cpython-36.pyc b/q03_scrape_clean/__pycache__/__init__.cpython-36.pyc index e99e1734469b0d74feccbb92229a5c70c95d8904..7aebc1c2854aa21da70c1cf94e5ade0faf603702 100644 GIT binary patch delta 56 zcmdnSxRQ~>n3tF9ds}(*L=JP6F#U}D+*JLL(&CK7A|TE%GB7aH56>^kE-pw+PSsD& KPf49v;06E(OA|8y delta 69 zcmZ3S5L{7(v>>D)5qaa;u2XO9+76{?_q6a5 zyaBJ|E8@^s;KU@oR5+S%ejLqw-}q!YJ$U%@>eC-e$ZvAzBpAO!^PdqUkyMkC4xW{4 z@Vw-MPs#*6)9EHFGfIFpqb3KAI3Dl-@!p>HA0?8@DjH#mcw&1jsy z2GIqz>h!{NwnkFJNfCQOZ_xZZgg_d)C40J~fo*BSCEc?f+p;E+Y)>VBOm;k^O%_I5 z-VYus$u?xO`pGvFgxNUe4lX_EtB9k3Di!Ig>9rkXBwzOad~`F`PvB! zRjom^#j;ac&h2$P`u}Q-qkON7&;vT5hx7q`#N2(%zn!i_u>M6+Ks&!u7s`TEVs6}d z(Pzb5|ZzQOXmZkN*Le CL%&i0 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^kE-pw+PSsD& KPf49v-~#{(&l5`k delta 69 zcmZ3_xQCI$n3tF9*up(g6FJNcGxbA@Q;UlA6O%GBi!)NQi%XM=5_1#tG86OkT~dp) ZOY#f!^9xe*;tPuMvr>~wiYF%f003F;8Rq~1 diff --git a/q03_scrape_clean/tests/__pycache__/tests.cpython-36.pyc b/q03_scrape_clean/tests/__pycache__/tests.cpython-36.pyc index 8529c871c1d09e03d187c6dc0d0810c3df16d3e3..7727a1c6beba506f362c16d8afb58a02b8140fa0 100644 GIT binary patch delta 59 zcmeyu^_+{tn3tF9ds}(*MvgCxDv|mb`MIh3A*IC`iA6x1VPs%nrXQYPlwDkqn4GGg NoS%}qS(nM3831_j6o&u+ delta 72 zcmaFP^@WSWn3tC;bkUxujT~PX4b${Pi&Kk=^%IjaGK(`(vx`fUiV|}Z^D-0j^j%Vm cvrF;|^z#c+^WqDN^0QKtONuuuFu5}W0Lz^kvj6}9 From 5a2d3a70e57b64ea2b136e685281a584cc7b9727 Mon Sep 17 00:00:00 2001 From: Tusharshah2006 Date: Sat, 18 Aug 2018 05:02:57 +0000 Subject: [PATCH 04/13] Done --- q02_append_row/build.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/q02_append_row/build.py b/q02_append_row/build.py index b86abd8..8e546dd 100644 --- a/q02_append_row/build.py +++ b/q02_append_row/build.py @@ -10,6 +10,8 @@ def q02_append_row(path): df = q01_load_data(path) df.loc[len(df)] = df.iloc[:,6:10].sum(axis=0) + df.fillna(value=0, inplace=True, axis=0) + return df q02_append_row(path) From c77043e48ec94cad357692bef8804a0429fb66d2 Mon Sep 17 00:00:00 2001 From: Tusharshah2006 Date: Sat, 18 Aug 2018 12:17:15 +0000 Subject: [PATCH 05/13] Done --- .../__pycache__/build.cpython-36.pyc | Bin 512 -> 486 bytes .../__pycache__/__init__.cpython-36.pyc | Bin 177 -> 164 bytes q04_mapping/__pycache__/build.cpython-36.pyc | Bin 877 -> 997 bytes q04_mapping/build.py | 20 ++++++++++++++++-- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 183 -> 170 bytes .../tests/__pycache__/test.cpython-36.pyc | Bin 1685 -> 1672 bytes 6 files changed, 18 insertions(+), 2 deletions(-) diff --git a/q01_load_data/__pycache__/build.cpython-36.pyc b/q01_load_data/__pycache__/build.cpython-36.pyc index 08770d44c8e17399954e6e9aae2e6e6b649f7770..82881a9d751325eb5ce95a30ccae556fff7e9ab4 100644 GIT binary patch delta 169 zcmZo*dB)6X%*)HA*933v6keQB<5(c-C`<8xi#^h zxb!WS%$)q>Tg=6!xtdJ3SPBwLGHx-Yq^)Eq5}0hqm>JH&00fL&j6#e`OhrOKwkFFh xwt~dGl*Hm9kX#WThyY0x37`^!K<+ILo80`A(wtN~CLphv4M=b>u`qJ50|2a1DZ>B& delta 190 zcmaFH+`z(V%*)I5v#mT@b|PmPqtC|Jhdo_B{L^K87NYkdyBQ8C^N6*7He@v zVnM1V(=C>Q#FC6#OetwA8H)HPt1)KUaxnk_BNw9(qY{uT5(M%zS#GfvB<7_g78kJt UxkbDn0whtyk4gwkKE)^l0MBeSyZ`_I diff --git a/q04_mapping/__pycache__/__init__.cpython-36.pyc b/q04_mapping/__pycache__/__init__.cpython-36.pyc index ee0618f2c89597e870d478c12dab4aec6d95e7c7..5f068843e5a8c43c67352a296e70c32eb94fa1f0 100644 GIT binary patch delta 56 zcmdnUxP+0zn3tF9ds}(*L=JP6K>dvT+*JLL(&CK7A|TE%GB7aH56>^kE-pw+PSsD& KPf49v;0OQ&T@xPw delta 69 zcmZ3&xRH^=n3tE!W7eLii5%vJar&XfsYS*5iAfom#TlvD#idC_iMfe+nTdJ&E~&-Y YCHV#V`30$Y@dZWsS*gh-#S@bq0Wzu?HUIzs diff --git a/q04_mapping/__pycache__/build.cpython-36.pyc b/q04_mapping/__pycache__/build.cpython-36.pyc index 8283165768b4bf279030f79c34448f8435bb4125..27071c15b69fa15c695e903369e2caa7fdd62f2c 100644 GIT binary patch literal 997 zcma)5&2AGh5VpO)*(6nNw9rG2M5x)&LM2dzK-_z23(|5}Iculc;Qgt++on-^3O)A9 zJMc=ra>^@kV!Vw|kT_szX1p`se4ZJ5kGkF9#m@Z88w;VIXlubYdJm#LfntbZfg;>k z5|PGQk=0l`a=;SdW?tlBgSCX8wW1d6?I>VQ)MhU8zM-hYJ3Qd+6@dsoLj!*e+~{apT&Ve?*Mw9eY023z zQP&AEw6L6wd<3h$gR0OHt?(ULl9}lR-4lixxhE5{hh~IX%znTSvnqQ@R`>+L-T|)> z_rb!ba%bKW1A|rhRcmQ65AuRpdxc={@1YfB-9hfG!&)q0ZPqbaOTxN<>n`n;VgGaT zgqRax4m+o77phwapd#I&Hv|*bHcOLATZ^;=d?mFbiW@Gqo92p32xPPzINB*`HGTPL z4&jwd;?c$&X%8S}nqU4v@+lnl>olAe84u5EHKh_{dN>*#ho1}iRh7_om=uhMCCwRC z@nxMd&f-!QGoDo8)#z2cVGGA~D%h~R)$J{B8xBxCPzd|@Iqs1F?~@*g+y~#FtKCOp zX)w^xt3I0hDu#c(;9*loGuG(%e{#1U`zG1^f%1t_ myGEH(n^A44XW-NRNmj60@OS1Cn>Kyi!#?TY4z{sP{O)hHO%Bxn literal 877 zcmZuv&2H2%5VoD)Zd+6#4n=^p*S%~?L5Rbu0>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^kE-pw+PSsD& KPf49v;0^!>;S)Ci delta 69 zcmZ3*xSf&1n3tF9@$NlQ6FJNcQ}jcNQ;UlA6O%GBi!)NQi%XM=5_1#tG86OkT~dp) ZOY#f!^9xe*;tPuMvr>~wiYF$!0{~+O8VUda diff --git a/q04_mapping/tests/__pycache__/test.cpython-36.pyc b/q04_mapping/tests/__pycache__/test.cpython-36.pyc index 7f7c96e914a8d9dd0deb7c46cab1b7ff9ad3e05a..23e6172e3f342cda2974ed8c2664632b550fd4fc 100644 GIT binary patch delta 59 zcmbQr+ri6W%*)I5y{$ZYBgb<_m0Qb`iV&ynZ+5Y*~O(vMTxnId6|iM`Yx%( b*(Lb}`uPQ^dGQ5B`B|ySCB>VCnMzpznBp27 From 26caa1cd63ad691374bd9e75547bd4115fa706e8 Mon Sep 17 00:00:00 2001 From: Tusharshah2006 Date: Sat, 18 Aug 2018 12:51:17 +0000 Subject: [PATCH 06/13] Done --- .../__pycache__/build.cpython-36.pyc | Bin 562 -> 612 bytes .../__pycache__/__init__.cpython-36.pyc | Bin 192 -> 179 bytes .../__pycache__/build.cpython-36.pyc | Bin 808 -> 1099 bytes q05_replace_missing_values/build.py | 20 +++++++++++++++++- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 198 -> 185 bytes .../tests/__pycache__/tests.cpython-36.pyc | Bin 1741 -> 1728 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 f4f2d51effb911aaf2909d59c7aeb1dd9ecb1f49..418a5bad2092577416849bae9de3b7d56791a295 100644 GIT binary patch delta 247 zcmdnQ@`Q!cn3tEUVMTfLwuzjxxL6q&7@UE)*k$5c)A}sd6y_8VX6t2UWT;^bX3%8! zd&vfrf5`$@)9+fZm|?3mSo&wN=aMEP{a>Z|0_^GW3nM*3LgiM z!@$VFsKF$_R3tcgA)^%It;u^BZLD~K;zfcW0;C>^5CC#-aoFVMrKt_IX)Z}-JHdY)!1z=T0V0#e+H&Egh chfQvNN@-529moO2AW05J0VW^kE-pw+PSsD& KPf49v5C8xTClgx$ delta 69 zcmdnYcz}_^n3tE!f7YI;i5%vJx%#2SsYS*5iAfom#TlvD#idC_iMfe+nTdJ&E~&-Y YCHV#V`30$Y@dZWsS*gh-#S@bQ06$?Fc>n+a diff --git a/q05_replace_missing_values/__pycache__/build.cpython-36.pyc b/q05_replace_missing_values/__pycache__/build.cpython-36.pyc index 6a32964667ab0d808d5677d1ae67893cfb4e2b10..d93cb0c08531f689bd38c62c7540ac4cee4fec4f 100644 GIT binary patch literal 1099 zcma)5%We}f6tz9iOp-RO5F%AUS&~IFX-m666#}uQo3=t4KqF`DG!y1kds5OUU4<_D zA@DE!fVZsj3#_=FMpcnO!lV0`>-+M#_I|VJ?LD4;_+cRQ6Fpca=&ym~M_>#woS*<# zk_1L2&A_ar6<8oiVy8~vVC`!pZdwa!pqqimtf0=~swCkuRp zK)1lE$-Xr(D($f|$B@A&-Lf_}m;-U%xV}K3yKS_9sB4HFH&~5%tj-!bYED=a{F-xf zp|jst9+D%()+$R2wDn5c&{YAL&EusF9WOm#0s{j?OgfF_Y1dHJB~2zgaN?{;XvBr~ zoIN?q;*zt@Nl8mCJNdBlCgmcI=*&CIGMaMsvU9l9m;@#r41_|E$w=}@*-@TM(o8t8 zr!1-C6?u1}$mwyH2z?nU2D*;E)7OMXS(&j;V8}@-bf=JyXMsJ8lO&^x6fAHBhmpcm zl*!_#RK_eWz`qpAO7bsUC_Bz17q9`N?pn$!XgS)w6MJyEhGBmt_LZ}`4d0O1hGM@y z`J+7L{^>-Hr~n%6_4|kZ`&@jM1;FA*IpcmoGe%{2K8YD;VIlG{k4pcde-H{@p%93?BxeN}@1;3(Yo+k02_t!pqe>{p_)mjC7u>U`?_wQ#F3GW<(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..24b5c6e 100644 --- a/q05_replace_missing_values/build.py +++ b/q05_replace_missing_values/build.py @@ -1,13 +1,31 @@ +# %load q05_replace_missing_values/build.py import pandas as pd import numpy as np import sys import 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 from greyatomlib.pandas_guided_project.q04_mapping.build import q04_mapping path1 = 'data/excel-comp-data.xlsx' path2 = 'data/scraped.csv' def q05_replace_missing_values(path1,path2): + #df = q04_mapping(path1, path2) + df_02 = q01_load_data(path1) + df_02.loc[len(df_02)] = df_02.iloc[:,6:10].sum(axis=0) + df_02.fillna(value=0, inplace=True, axis=0) + + df_03 = pd.read_csv(path2) + mapping = dict(zip(df_03['United States of America'].str.lower(), df_03['Unnamed: 6'])) + + df_02.insert(loc=5, column='abbr', value='') + df_02.iloc[:,6]=df_02['state'].map(mapping) + + df_02.iloc[6,6] = 'MS' + df_02.iloc[10,6] = 'TN' + + return df_02 + +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..41f854d6c9019dabe03a30e9308975472651d276 100644 GIT binary patch delta 56 zcmX@cxRa5?n3tF9ds}(*L=JP6H2sYH+*JLL(&CK7A|TE%GB7aH56>^kE-pw+PSsD& KPf49v5C#Acs}pko delta 69 zcmdnVc#M(5n3tC;e(#>Bi5%vJ#rmPesYS*5iAfom#TlvD#idC_iMfe+nTdJ&E~&-Y YCHV#V`30$Y@dZWsS*gh-#S@dm08gM9!~g&Q 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..bf533d42f484ca8a47003a0e76f73688a149df84 100644 GIT binary patch delta 59 zcmX@hdw`e2n3tF9ds}(*Mh-S6m1O;l{M=OikkaCe#3CThFfuSO(+|%t$}TQQOitBL N&QD3*Y|qrk0sulz6Se>V delta 72 zcmX@WdzP2On3tDp?!G-y8#&mR3=8x_i&Kk=^%IjaGK(`(vx`fUiV|}Z^D-0j^j%Vm cvrF;|^z#c+^WqDN^0QKtONuueG4-(k0G>=5MgRZ+ From 282b47b9f7abc73b02b4de68fba531ab344d41d1 Mon Sep 17 00:00:00 2001 From: Tusharshah2006 Date: Sat, 18 Aug 2018 13:29:58 +0000 Subject: [PATCH 07/13] Done --- q04_mapping/__pycache__/build.cpython-36.pyc | Bin 997 -> 997 bytes .../__pycache__/__init__.cpython-36.pyc | Bin 179 -> 166 bytes .../__pycache__/build.cpython-36.pyc | Bin 740 -> 1231 bytes q06_sub_total/build.py | 21 +++++++++++++++++- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 185 -> 172 bytes .../tests/__pycache__/test.cpython-36.pyc | Bin 1424 -> 1411 bytes 6 files changed, 20 insertions(+), 1 deletion(-) diff --git a/q04_mapping/__pycache__/build.cpython-36.pyc b/q04_mapping/__pycache__/build.cpython-36.pyc index 27071c15b69fa15c695e903369e2caa7fdd62f2c..a163f45d6ced814ebc8b20692af3aa2e4df43808 100644 GIT binary patch delta 166 zcmaFL{*;~7n3tE!b0h0wM#fu{S29`v$w!Q)Vmu5C47ZqbQuA)HrDf*iDoD9C zS(nLH`W9!mF5;y-eSrtxHVawxl&#lC|e{0B0$=T6i^Ap$@`hr0HJL$uK)l5 delta 166 zcmaFL{*;~7n3tDJdn4;&M#iYgD;X_-oVC&N3o`)#TytwDC1k~xrqe@nR)3e8H%JPw=z{}$N;r!^4?-ANX$z~EG`lNn^as` se2Xc+IEpo|G`FDg7E@k9)MRz$N_lahY>@^kE-pw+PSsD& KPf49v;0yo-i4!LP delta 69 zcmZ3+xS5f|n3tC;X4amli5%vJ3HqVMsYS*5iAfom#TlvD#idC_iMfe+nTdJ&E~&-Y YCHV#V`30$Y@dZWsS*gh-#S@dA0XWndQUCw| diff --git a/q06_sub_total/__pycache__/build.cpython-36.pyc b/q06_sub_total/__pycache__/build.cpython-36.pyc index adaf0ce0d3ca686ab384f6f40e1d0fd216b66a0b..8692710103b20ad3e5cd8454e284cd493db544d7 100644 GIT binary patch literal 1231 zcma)6OK%%D5GJ`#tsYkEG^tx7)v-E6QWC_6!U)n9=%GN20(MYR^F#7S`XhMl$*10X>TnelF3yaON8hXZLBppZxJ~{mZ$J(C_HZ@;#eYz+m%ocRwDf(paI_dLK?Qdh(@q_GA=r_)B1dw6kXZ{J)k`v(ms!P{1(xH z7>J(e?+AGCIU09vfd`$9u^k%4@-j6-n^e~_H(={u%^s(+Vm#%{Ffe>^HG7sSQA?JI zw8*v2%Vqk8$wuhSk=rvB>rBW;Syj}J-1}rL^?EaGT{=^&7JQQFHyLrX@Pr@%$oC-n zHvogSXoqjemaN>l(L2I1C-2CD9HABA9{1m4@Oj4Hk{v!ppa)=e62A8^GT|!PV#wf` z*mSlYk035tb$1B#_z3MF>IPz0J>KC7@A96D+7jM}ef_P!bJ_o9UXWA72d(8Z&<l^SUbc-? z5%@QszbbPh_~_g)xPwu(7=2p^m1k^|yedmp2>#9JOvhw&~Ut7~F+$K_ixBRZ|-4{m4q|{UGMnd&$(8D3`Vc&|Teo{Xn^K zq<-#LJlzzk>nJ=aN*XS5DNANa&1tLzj0jw-^?9B_`b}QLexqz4t6zn(VP0yXz)`T; zMoU#S_56Aq+Ms6U^6`FoLIb`?XCIfRHiEr1j2DdfBGt|O15yux{m-AKmsKIA7mdDT z3gq(1Y<4pJxl*rn4O2OFC!N-;f_Cg*~uwW?MkGt;ZtiOZCl3R*IqH@W1K`r1wT z9s2-C^nCz?WBfH9k^~=a^4U*7|Wp)Ea-nDlUu_}C}$;a>xFQ*QtO delta 428 zcmYk1Jxjwt7{~7|X-pe&5ws{2JJls8OF-(yyEf@dF5D$ZrNyC6Zl#~X zkKq^4!9loHzk}f9MHdhLzk8m$=YP*VuPdKcz3F-G*ZXr2BLF_Yzh!c8Y^2T>_0~EG zTxJDjX0y@*2r3L-fQGYp+=kWVHK{J%4(^GmwT(^+&#plRreF%^XojYUL53J+gjs!S z6AU1Ob2vbAFvC-9Ub62tZe^VD+C=2Cro<@EVv*D$E_py`7)p&hG|~8!hZ>(#sjW<8 zbkx8Sn?}0SmxASKIMG<;;|9@IO0#J1Z`%(X*6a4-gpLB+L@E!TfUFqb_mzLCxKut3 zqgX|JXs#q3(^kE-pw+PSsD& KPf49v;0XW;4HG{A delta 69 zcmZ3(xRa5?n3tEUbpM{Hi5%vJY5JkXsYS*5iAfom#TlvD#idC_iMfe+nTdJ&E~&-Y YCHV#V`30$Y@dZWsS*gh-#S@b~0ZXMBr~m)} diff --git a/q06_sub_total/tests/__pycache__/test.cpython-36.pyc b/q06_sub_total/tests/__pycache__/test.cpython-36.pyc index 691280a23f33a47bb86c6a2aef8fba66bc436cb3..8baba7208947df4ff58d28568f1dd446974946fa 100644 GIT binary patch delta 59 zcmbQh-OSBl%*)I5y{$ZYBgaQZl~DbR{M=OikkaCe#3CThFfuSO(+|%t$}TQQOitBL N&QD3*ti_bZ3;;_U6V?C# delta 72 zcmZqXp1{pv%*)HQ?ZBR>jT|2t4U_aki&Kk=^%IjaGK(`(vx`fUiV|}Z^D-0j^j%Vm cvrF;|^z#c+^WqDN^0QKtONuwkGNmyC0J4J`fdBvi From 22f4cb2d02ed635c77639d6f942bfb9023c14a00 Mon Sep 17 00:00:00 2001 From: Tusharshah2006 Date: Sat, 25 Aug 2018 03:45:16 +0000 Subject: [PATCH 08/13] Done --- q04_mapping/build.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/q04_mapping/build.py b/q04_mapping/build.py index d32a21c..fa1f227 100644 --- a/q04_mapping/build.py +++ b/q04_mapping/build.py @@ -13,10 +13,11 @@ def q04_mapping(path1, path2): df_02.loc[len(df_02)] = df_02.iloc[:,6:10].sum(axis=0) df_02.fillna(value=0, inplace=True, axis=0) + #df_02 = q02_append_row(path1) df_03 = pd.read_csv(path2) mapping = dict(zip(df_03['United States of America'].str.lower(), df_03['Unnamed: 6'])) - df_02.insert(loc=5, column='abbr', value='') + df_02.insert(loc=6, column='abbr', value='') df_02.iloc[:,6]=df_02['state'].map(mapping) return df_02 From 8eefd52b0915b955417b4a9a76dac5ec88bfd897 Mon Sep 17 00:00:00 2001 From: Tusharshah2006 Date: Sat, 25 Aug 2018 03:53:02 +0000 Subject: [PATCH 09/13] Done --- q05_replace_missing_values/build.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/q05_replace_missing_values/build.py b/q05_replace_missing_values/build.py index 24b5c6e..2baaa03 100644 --- a/q05_replace_missing_values/build.py +++ b/q05_replace_missing_values/build.py @@ -10,7 +10,7 @@ path1 = 'data/excel-comp-data.xlsx' path2 = 'data/scraped.csv' def q05_replace_missing_values(path1,path2): - #df = q04_mapping(path1, path2) + df_02 = q01_load_data(path1) df_02.loc[len(df_02)] = df_02.iloc[:,6:10].sum(axis=0) df_02.fillna(value=0, inplace=True, axis=0) @@ -18,9 +18,10 @@ def q05_replace_missing_values(path1,path2): df_03 = pd.read_csv(path2) mapping = dict(zip(df_03['United States of America'].str.lower(), df_03['Unnamed: 6'])) - df_02.insert(loc=5, column='abbr', value='') + df_02.insert(loc=6, column='abbr', value='') df_02.iloc[:,6]=df_02['state'].map(mapping) + #df_02 = q04_mapping (path1, path2) df_02.iloc[6,6] = 'MS' df_02.iloc[10,6] = 'TN' From a67fd06941876bd30646002a14d24af174fdf0e1 Mon Sep 17 00:00:00 2001 From: Tusharshah2006 Date: Sat, 25 Aug 2018 03:54:52 +0000 Subject: [PATCH 10/13] Done --- q06_sub_total/build.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/q06_sub_total/build.py b/q06_sub_total/build.py index 75a3113..1a2457c 100644 --- a/q06_sub_total/build.py +++ b/q06_sub_total/build.py @@ -19,14 +19,14 @@ def q06_sub_total(path1,path2): df_03 = pd.read_csv(path2) mapping = dict(zip(df_03['United States of America'].str.lower(), df_03['Unnamed: 6'])) - df_02.insert(loc=5, column='abbr', value='') + df_02.insert(loc=6, column='abbr', value='') df_02.iloc[:,6]=df_02['state'].map(mapping) df_02.iloc[6,6] = 'MS' df_02.iloc[10,6] = 'TN' #df_02 = q05_replace_missing_values(path1,path2) - df_sub = df_02.groupby(['postal-code'])[['account', 'Jan', 'Feb', 'Mar']].sum() + df_sub = df_02.groupby(['abbr'])[['account', 'Jan', 'Feb', 'Mar']].sum() return df_sub From 7a822038300378bc6cfd226707b07f5a45850e85 Mon Sep 17 00:00:00 2001 From: Tusharshah2006 Date: Sat, 25 Aug 2018 04:35:18 +0000 Subject: [PATCH 11/13] Done --- .../__pycache__/__init__.cpython-36.pyc | Bin 177 -> 164 bytes q07_symbols/__pycache__/build.cpython-36.pyc | Bin 866 -> 1333 bytes q07_symbols/build.py | 24 +++++++++++++++--- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 183 -> 170 bytes .../tests/__pycache__/test.cpython-36.pyc | Bin 1411 -> 1398 bytes 5 files changed, 21 insertions(+), 3 deletions(-) diff --git a/q07_symbols/__pycache__/__init__.cpython-36.pyc b/q07_symbols/__pycache__/__init__.cpython-36.pyc index 60b0cca0e5314ee04b43a312e722ec776bd47aea..19f1e6af1d3a9f8011a038a9d50c4722e26aa474 100644 GIT binary patch delta 56 zcmdnUxP+0zn3tF9ds}(*L=JP6K>dvT+*JLL(&CK7A|TE%GB7aH56>^kE-pw+PSsD& KPf49v;0OQ&T@xPw delta 69 zcmZ3&xRH^=n3tC;b=ID!i5%vJar&XfsYS*5iAfom#TlvD#idC_iMfe+nTdJ&E~&-Y YCHV#V`30$Y@dZWsS*gh-#S@bq0XcRVQvd(} diff --git a/q07_symbols/__pycache__/build.cpython-36.pyc b/q07_symbols/__pycache__/build.cpython-36.pyc index d28eaa97376de522868951cb3b126c6c53715554..878e48ae1c2551d32311332f9e975575cd8a74e1 100644 GIT binary patch literal 1333 zcmZux&2Aev5GJ|5k}X@d6UPSHz(rdi0vgFlkQ4|EqeX!p3Pcw>Ex;ZY)RK~S!~F@# zO(j(Z3Me_|LHY)Ljvm=#Pkx1-I$Q;T3zWiq9L@~MnUAx2((85q`0KZyfAkUh8{HbP zM&E#F1Hci-5>edFgnBR&=@$VF@WvO?u=PbW5@8a=8L;(UpFT=t#dyM* zVasEOBQZ~fe3({6{m`w4bE)Uce(TbyVzuDIRKH1yI~YdzLB4}o{|R8w3a#-qS&`h; zirx{9IeAB>N%-Ew$b@;cf;z7~6PwP;;}PuZ=38q7 zdVGx5uL~(hoJ4W+P(JH9p0J2J$#q< z`5xcr2eZIsxJLOdzr*jobyWnb09ZU4-?%bwx&R6T0Czr{XZmvB+29S6ji6Ch){><{ zxya?w%Q7>9pIjIQjGt7~lWz;5vXm{mFUyh@f*| z<3n%^yz$ce;!C~se|`Sd^?=xLTB(A;$yw=|0?&U(>HxO>Gag-4g&18n`id!#tH-CO z&qhC0>Xojc(otG*F{)X~nNDU+#syDmRplZzqt~ZjCwfs#Dyc`4CX;+vFKm1!Sux@4 z{JzT$1T8M7d&G06qAq_mu}a^)pACr<+1`U=1val7`bv%92@9 za~dlF%?<5peV(OI;xelt-T-g1`b8)kW~CMi90jXwG*eYmPZl(0buAZQ8iY2enYntj znI6-CPm|LR(-Rv(NS&24_;9C*ZYC{l8@S{0*}7HTE*SJ70KzeTfcvD2KOudPF7A2{ zi258ngMAxr_*6%*q(Rvfz#A!RdQZQSf~j&?0O>N(LITZMRVw!#LP-m4Nu{mtvb7IAM+pE+;|-zwO3 gjB2Zn&mhM}igTBmcBU9g-Uf;BeX{NO*eCJ9zuTx}ApigX delta 494 zcmYjN%}OId5bo+3$Jrz*cySNA5>bSR7=KV^|Ih__DpTn+#h}1<9$@ zIkOnT-4oFPX8*lt|1d(EHtTd#(-qe!SF@ZIDJ$CFg}Js;wWSh8thDTjD{ChI=pigk z_Pwn~w@DN-rLum`RLigC6tmsEceft}JaOAcjbu933Lf)hI`y6AvAn9^>>kIapLb+t z8u(zGDne_p2)d3@Yq<&(D>yS1RXmz2%3Sp;TBvAcB7Ai@bKsp$nPyx&Rr-S?caCY3 inW3(|o=y(G=8~70IB_R5%Sa)F&_IN+3JvOmPyYjpaCy1_ diff --git a/q07_symbols/build.py b/q07_symbols/build.py index b8cbb92..aff8145 100644 --- a/q07_symbols/build.py +++ b/q07_symbols/build.py @@ -1,18 +1,36 @@ +# %load q07_symbols/build.py import pandas as pd import numpy as np from sklearn.model_selection import train_test_split import sys import 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.q01_load_data.build import q01_load_data +#from greyatomlib.pandas_guided_project.q06_sub_total.build import q06_sub_total path1 = 'data/excel-comp-data.xlsx' path2 = 'data/scraped.csv' def q07_symbols(path1,path2): - "write your solution here" + df_02 = q01_load_data(path1) + df_02.loc[len(df_02)] = df_02.iloc[:,6:10].sum(axis=0) + df_02.fillna(value=0, inplace=True, axis=0) + + df_03 = pd.read_csv(path2) + mapping = dict(zip(df_03['United States of America'].str.lower(), df_03['Unnamed: 6'])) + + df_02.insert(loc=6, column='abbr', value='') + df_02.iloc[:,6]=df_02['state'].map(mapping) + + df_02.iloc[6,6] = 'MS' + df_02.iloc[10,6] = 'TN' + #df_sub = q06_sub_total(path1,path2) + df_sub = df_02.groupby(['abbr'])[['account', 'Jan', 'Feb', 'Mar', 'total']].sum().applymap(lambda x: '$%s'% '{:,}'.format(int(x))) + + return df_sub +q07_symbols(path1,path2) -#print(q07_symbols(path1,path2)) diff --git a/q07_symbols/tests/__pycache__/__init__.cpython-36.pyc b/q07_symbols/tests/__pycache__/__init__.cpython-36.pyc index f854b4a6bde19801b4c6c3a23a6caed8dcc7fd6e..8097d1d30253a6d91b2d8a12a5f941c5673d1f15 100644 GIT binary patch delta 56 zcmdnaxQda(n3tF9ds}(*L=JP6aQ%$@+*JLL(&CK7A|TE%GB7aH56>^kE-pw+PSsD& KPf49v;0^!>;S)Ci delta 69 zcmZ3*xSf&1n3tDp^7B1W6FJNcQ}jcNQ;UlA6O%GBi!)NQi%XM=5_1#tG86OkT~dp) ZOY#f!^9xe*;tPuMvr>~wiYF$!0{~iU8Rh^0 diff --git a/q07_symbols/tests/__pycache__/test.cpython-36.pyc b/q07_symbols/tests/__pycache__/test.cpython-36.pyc index 1a8a9c3d7050cc5a1b640e55a727c322ab8a9092..90238dfc9db8081e5d4628e4bc447c511b16f84d 100644 GIT binary patch delta 89 zcmZqX{>H^&%*)I5y{$ZYBgcD2m0Qb`iV&ynZ+5Y*~O(vMTxnId6|iM`Yx%( z*(Lb}`uPQ^dGQ5B`B|ySCB=)SnHU*wZI)r4!^kGWz`#%>F?k Date: Sat, 25 Aug 2018 05:09:41 +0000 Subject: [PATCH 12/13] Done --- .../__pycache__/__init__.cpython-36.pyc | Bin 186 -> 173 bytes .../__pycache__/build.cpython-36.pyc | Bin 1055 -> 1254 bytes q08_append_subtotals/build.py | 30 +++++++++++++++--- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 192 -> 179 bytes .../tests/__pycache__/tests.cpython-36.pyc | Bin 2221 -> 2208 bytes 5 files changed, 26 insertions(+), 4 deletions(-) diff --git a/q08_append_subtotals/__pycache__/__init__.cpython-36.pyc b/q08_append_subtotals/__pycache__/__init__.cpython-36.pyc index df1c3a25dc9d1d7d1993fbeeddeb2d69af4df5ca..58169e2ef99c8a89459cd934e3969c7666e0b012 100644 GIT binary patch delta 56 zcmdnRxR#N_n3tF9ds}(*L=JP6DE*B5+*JLL(&CK7A|TE%GB7aH56>^kE-pw+PSsD& KPf49v-~|8)qZ2~_ delta 69 zcmZ3>xQmg)n3tC;XV#vmi5%vJ>H49?sYS*5iAfom#TlvD#idC_iMfe+nTdJ&E~&-Y YCHV#V`30$Y@dZWsS*gh-#S@dg071VQegFUf diff --git a/q08_append_subtotals/__pycache__/build.cpython-36.pyc b/q08_append_subtotals/__pycache__/build.cpython-36.pyc index d03d4af14ac147d09523754dc73016ed3fde84ea..834d15e7f504c500a615700870900304f7edc8ff 100644 GIT binary patch literal 1254 zcmZuxON$#v5bnp!Xf(T8%a3fl!4QQ!h#;0^o0wq4k`Tzj;Jxe`!{i`ZQ!VYtJr8%! zIFh1;fV@Zlko=YWguW)1z2}rusz*uKz&6xly1J^r`nr3bbUM-HAHV$gn@7m+^0VpeY8vkSu1W)0z3}Ei`(Es@Q%chjASU=TZR#OO8TuU ztVd4z)OOyC9!*psU;?5N>m#R!a+yf=Fe$R~q5B>zm07O4O~@o#loAGsd7Cg-1V@14 zqkNBI{zO%g4cXEQwqXm0mRvHRz%JR09gzhC4&Hl;FukKOtN!24Gd3pBX=Xk^ z@1XGxn_Ul}J;#0E7Ifh@+?jh0-MYl8FY6nZ8nYLtF*`f4{JF?2|3OYIe<8H>tD+Jr zaai1N7B3h%MKO0!xkFiyin_zv(nAdN`N^7p_PJSmKR^5GqR(tFD|99*%hSBVe(3U7 zqFw4=uZHJECWmLWITsq`{PAe?boi>!uT6;!4wC}puoO86Gnv;ZNSKtmSjeOrz8QTp z5oIZJn3#InU^K&NohlfVD;tiL$fh8UKXx!t$oh+$G6rL0Lnw2M&Mu+Pw0kd&Lf^Hz z^Sj#JRO_XVKW^$whwhszna9B_RVo*jl@Nzo;yb{bZ9Pa6YP5Hb`?L zH3l+K+SXhbbva$dAvU8{IMolVUyADd(at=^Cpnvp{xMH%3zw8>K92*O#?Biecj~Ug zbMK}$I~Xw^p&~S-U(zm%=mXY8iD<+h&>lNr`csVd_iV7ETi?ge*w5<>*<`uvU}Y>T zO#Jm+%ay2#Or_Jojb}6X-``-+97;o;?qN~=iBoR3YtY?o&<*}@oE1w5ah+*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..bd45537 100644 --- a/q08_append_subtotals/build.py +++ b/q08_append_subtotals/build.py @@ -1,15 +1,37 @@ +# %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.q01_load_data.build import q01_load_data +#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" + df_02 = q01_load_data(path1) + df_02.loc[len(df_02)] = df_02.iloc[:,6:10].sum(axis=0) + df_02.fillna(value=0, inplace=True, axis=0) + + df_03 = pd.read_csv(path2) + mapping = dict(zip(df_03['United States of America'].str.lower(), df_03['Unnamed: 6'])) + + df_02.insert(loc=6, column='abbr', value='') + df_02.iloc[:,6]=df_02['state'].map(mapping) + + df_02.iloc[6,6] = 'MS' + df_02.iloc[10,6] = 'TN' + + #df_sub = q06_sub_total(path1,path2) + df_sub = df_02.groupby(['abbr'])[['Jan', 'Feb', 'Mar', 'total']].sum() + df_sub.loc[len(df_sub)] = df_sub.iloc[:].sum(axis=0) + + df_sub = df_sub.applymap(lambda x: '$%s'% '{:,}'.format(int(x))) + + return df_sub + +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..4c5baa750f7ce33fb67d46f5ccf617b44e231304 100644 GIT binary patch delta 56 zcmX@WxS5f|n3tF9ds}(*L=JP61pSQs+*JLL(&CK7A|TE%GB7aH56>^kE-pw+PSsD& KPf49v5C8xTClgx$ delta 69 zcmdnYcz}_^n3tF9__2dg6FJNcbM-@uQ;UlA6O%GBi!)NQi%XM=5_1#tG86OkT~dp) ZOY#f!^9xe*;tPuMvr>~wiYF!q003sk8X^Dy diff --git a/q08_append_subtotals/tests/__pycache__/tests.cpython-36.pyc b/q08_append_subtotals/tests/__pycache__/tests.cpython-36.pyc index da1ab93cde97498d1677c07a0db5dd9f0d819fda..155e7b8d8b1b9fad03d6182ad5a7e80e01041f74 100644 GIT binary patch delta 59 zcmZ20xImD@n3tF9ds}(*Mh*ccm010Z{M=OikkaCe#3CThFfuSO(+|%t$}TQQOitBL N&QD3*?8%hE1^_lL6J!7Y delta 72 zcmZ1=xK@zEn3tD}@#Mj%jT{0@hFSWd#i>Qb`iV&ynZ+5Y*~O(vMTxnId6|iM`Yx%( b*(Lb}`uPQ^dGQ5B`B|ySCB>U Date: Sat, 25 Aug 2018 05:38:27 +0000 Subject: [PATCH 13/13] Done --- .../__pycache__/__init__.cpython-36.pyc | Bin 183 -> 170 bytes .../__pycache__/build.cpython-36.pyc | Bin 753 -> 1268 bytes q09_pie_chart_jan/build.py | 22 ++++++++++++++++-- .../tests/__pycache__/__init__.cpython-36.pyc | Bin 189 -> 176 bytes .../tests/__pycache__/tests.cpython-36.pyc | Bin 879 -> 866 bytes 5 files changed, 20 insertions(+), 2 deletions(-) diff --git a/q09_pie_chart_jan/__pycache__/__init__.cpython-36.pyc b/q09_pie_chart_jan/__pycache__/__init__.cpython-36.pyc index a0e3adda2425ca253c8c38291615762befb69f09..715a652a4c56c555b512b349d796114e77fd5e1f 100644 GIT binary patch delta 56 zcmdnaxQda(n3tF9ds}(*L=JP6aQ%$@+*JLL(&CK7A|TE%GB7aH56>^kE-pw+PSsD& KPf49v;0^!>;S)Ci delta 69 zcmZ3*xSf&1n3tEUY}THri5%vJDf*$ssYS*5iAfom#TlvD#idC_iMfe+nTdJ&E~&-Y YCHV#V`30$Y@dZWsS*gh-#S@d=0YTsyd;kCd diff --git a/q09_pie_chart_jan/__pycache__/build.cpython-36.pyc b/q09_pie_chart_jan/__pycache__/build.cpython-36.pyc index 25a6c0356fc0f0896f62b4a295440822c58e183c..22e770b0c3fde5af8be65c68e6c1d26a27bcfe5e 100644 GIT binary patch literal 1268 zcmZuw%WfMt6eT$iJuKN${78)ksg~6ulH#BNS{Oxx0$mh{H+E2fT@0upC2`DogrpKn zkbweffNuOD{gHkIw_O?igRXix^1?+s0?)nVees@4z3O(`Z~pq_=d%!@KhdKP_UJoU z<~IP2I97<_S`r$7Br41!8sVKSrg3d+(1wV!X4Vo7z;=y$fSoP&zuG%c-F%7Rv4R@N=XZ6 z-S?B1i7FXSIJ1lfY(8I~dUY&rQlVa?WnR7T`_YXuH|t()GO1>j;G@)hNQuu5U-YoP z2WkEQuxNv}_?B!)=1D-G2*;d!A~SM|GQtBM-eIr>Hr$XcK1ZNOaOzil7hq)Ltg!(C zZUfu2txdoi5ZBK3wg~j*DcVBREyQLW$lKy=zUQMhgm=KNy8&t*SDuk`#Jly$F=+d> zcH*n@1K#6({$w6P+FCw7a1Q)$=gdxt}a~gBP(3+gP6MDEz>TtrDci+l@vqb!fRP@hgUG?czfV3xUV`5J)|1&wD?se(CDaoW@ZUIC2MgzlDOT{3x`GWnqK{ zL(VGQ@i{wn`$<|Z3u|atsnQN37gfwIUhc#hjrc5?Jcw7W0kM@V=D#ET95VcUHC~jt z7+)>Tf@xTbv&rQ3_@`1|n+gaWrzIETiWQuhWWJPK@TAgZCQ>_oKlwTV3X&8eZIZEK zJY7n~N7c&p|6@CVV&(_{;U@kP_edK*BRyDc+$MSe=fe{h?+R(}N26kyLn=~K^r^X4 zg6U$E!);Vzgo66AEVO_7K+(!LQW_WfzFiCr3YbWkm9lURF0~&y%y+3lr(eyrSTS4X zN=`@r+t}z||Hx6@)NX|RoLSFt9lG)wjjNpuDrM=u`6z9=NTw{khAZgL;d=U+hk*xA l_#^lNwyt>&JuQ{^*0*9#0GdEh2lw!E+^NY4aY&lIe*oQKT*m+a delta 386 zcmYjNJxjwt7`~6Rrm=;B4(cF*PMLxVE*25&hC0u)FlQz9O?kEusv z^Dj908_X*H0Kv)0J9X#_@AH0tel2ulDOTYV!V@fW7QxCJ=bT1JxxR@f3t>(pT-78o+0LKXP3rW* zt@H$xZ?nEhe6E?&G3jTy&e+(76qyj76CU@N9vdNJAsJ7l5+gP+dLeNy4BXQ0aDW4( zoE5ECbxAlSxGZ|K>mInY-=Ry;u)fOgP6RCrc4%J^kE-pw+PSsD& KPf49v;0pi?WfM;T delta 69 zcmdnMxR;T`n3tF9*qMV-6FJNcv-CrYQ;UlA6O%GBi!)NQi%XM=5_1#tG86OkT~dp) ZOY#f!^9xe*;tPuMvr>~wiYF%f0sv*U8XEur diff --git a/q09_pie_chart_jan/tests/__pycache__/tests.cpython-36.pyc b/q09_pie_chart_jan/tests/__pycache__/tests.cpython-36.pyc index b3b93c26ee858c217a2f3323e231c646bd75d1f9..a6c4fae610e2e054ec6bc7b0ffb4be9b82d86b91 100644 GIT binary patch delta 59 zcmaFQ_K1zcn3tF9ds}(*MvkY9DpC3w`MIh3A*IC`iA6x1VPs%nrXQYPlwDkqn4GGg NoS%}qS&k`?5dd;e6kq@V delta 72 zcmaFF_MVNyn3tF9nA2AR#B cXP4v`=;s%t=EWBj