commit-live-students · nemkothari · Aug 12, 2018 · Aug 13, 2018 · Aug 21, 2018 · Aug 22, 2018
diff --git a/__pycache__/__init__.cpython-36.pyc b/__pycache__/__init__.cpython-36.pyc
diff --git a/q01_load_data/__pycache__/__init__.cpython-36.pyc b/q01_load_data/__pycache__/__init__.cpython-36.pyc
diff --git a/q01_load_data/__pycache__/build.cpython-36.pyc b/q01_load_data/__pycache__/build.cpython-36.pyc
diff --git a/q01_load_data/build.py b/q01_load_data/build.py
@@ -1,5 +1,12 @@
+# %load q01_load_data/build.py
 import pandas as pd
 
-
 def q01_load_data(path):
-    "write your solution here"
+    'write your solution here'
+    df= pd.read_excel(path)
+    df.rename(columns={'State':'state'})
+    df['total']= df['Jan'] + df['Feb'] + df['Mar']
+
+    return df
+
+
diff --git a/q01_load_data/tests/__pycache__/__init__.cpython-36.pyc b/q01_load_data/tests/__pycache__/__init__.cpython-36.pyc
diff --git a/q01_load_data/tests/__pycache__/tests.cpython-36.pyc b/q01_load_data/tests/__pycache__/tests.cpython-36.pyc
diff --git a/q02_append_row/__pycache__/__init__.cpython-36.pyc b/q02_append_row/__pycache__/__init__.cpython-36.pyc
diff --git a/q02_append_row/__pycache__/build.cpython-36.pyc b/q02_append_row/__pycache__/build.cpython-36.pyc
diff --git a/q02_append_row/build.py b/q02_append_row/build.py
@@ -1,11 +1,20 @@
+# %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
 
-
 def q02_append_row(path):
-    "write your solution here"
+    #'write your solution here'
+    df_final =q01_load_data(path)
+    sum_row=df_final[['Jan','Feb','Mar','total']].sum()
+    df_sum=pd.DataFrame(data=sum_row).T
+    df_sum=df_sum.reindex(columns=df_final.columns)
+    df=df_final.append(df_sum,ignore_index=True)
+    #df_final.sum(numeric_only=True)
+    #df_final.append(df_final.sum(numeric_only=True).T, ignore_index=True)
+    return  df
+
 
 
 

diff --git a/q02_append_row/tests/__pycache__/__init__.cpython-36.pyc b/q02_append_row/tests/__pycache__/__init__.cpython-36.pyc
diff --git a/q02_append_row/tests/__pycache__/tests.cpython-36.pyc b/q02_append_row/tests/__pycache__/tests.cpython-36.pyc
diff --git a/q03_scrape_clean/__pycache__/__init__.cpython-36.pyc b/q03_scrape_clean/__pycache__/__init__.cpython-36.pyc
diff --git a/q03_scrape_clean/__pycache__/build.cpython-36.pyc b/q03_scrape_clean/__pycache__/build.cpython-36.pyc
diff --git a/q03_scrape_clean/build.py b/q03_scrape_clean/build.py
@@ -1,9 +1,20 @@
+# %load q03_scrape_clean/build.py
 import pandas as pd
 import sys, os
 import requests
 sys.path.append(os.path.join(os.path.dirname(os.curdir)))
 
+def q03_scrape_clean(path):
+    df1= pd.read_html(requests.get(path).text)
+    df = df1[0]
+    df_new = df[11:]
+    df_header = df_new[1:]
+    header = df_new.iloc[0]
+    df_header.rename(columns = header,  inplace=True)
+    df_header.rename(columns = {'United States of America':'UnitedStatesofAmerica'},  inplace=True)
+    return df_header
+
+
+
 
-def q03_scrape_clean(url):
-    "write your solution here"
 
diff --git a/q03_scrape_clean/tests/__pycache__/__init__.cpython-36.pyc b/q03_scrape_clean/tests/__pycache__/__init__.cpython-36.pyc
diff --git a/q03_scrape_clean/tests/__pycache__/tests.cpython-36.pyc b/q03_scrape_clean/tests/__pycache__/tests.cpython-36.pyc
diff --git a/q04_mapping/__pycache__/__init__.cpython-36.pyc b/q04_mapping/__pycache__/__init__.cpython-36.pyc
diff --git a/q04_mapping/__pycache__/build.cpython-36.pyc b/q04_mapping/__pycache__/build.cpython-36.pyc
diff --git a/q04_mapping/build.py b/q04_mapping/build.py
@@ -1,10 +1,24 @@
+# %load q04_mapping/build.py
 import pandas as pd
 import sys, os
 import numpy as np
 #sys.path.append(os.path.join(os.path.dirname(os.curdir)))
 from greyatomlib.pandas_guided_project.q02_append_row.build import q02_append_row
+path1 = 'data/excel-comp-data.xlsx'
+path2 = 'data/scraped.csv'
+
 def q04_mapping(path1,path2):
-    "write your solution here"
+    df_scrap =pd.read_csv(path2)
+    df_clean = pd.read_excel(path1)
+    mapping = pd.Series(df_scrap['US'].values,index=df_scrap['United States of America']).to_dict()
+    #df_clean.insert(loc=6, column='abbr' ,value ='nan')
+    df_clean['abbr'] =  df_clean['state'].map(mapping)
+    df_clean = df_clean[['account','name','street','city','state','postal-code','abbr','Jan','Feb','Mar']]
+    return df_clean
+
+
+
+
 
 
 
diff --git a/q04_mapping/tests/__pycache__/__init__.cpython-36.pyc b/q04_mapping/tests/__pycache__/__init__.cpython-36.pyc
diff --git a/q04_mapping/tests/__pycache__/test.cpython-36.pyc b/q04_mapping/tests/__pycache__/test.cpython-36.pyc
diff --git a/q05_replace_missing_values/__pycache__/__init__.cpython-36.pyc b/q05_replace_missing_values/__pycache__/__init__.cpython-36.pyc
diff --git a/q05_replace_missing_values/__pycache__/build.cpython-36.pyc b/q05_replace_missing_values/__pycache__/build.cpython-36.pyc
diff --git a/q05_replace_missing_values/build.py b/q05_replace_missing_values/build.py
@@ -1,13 +1,40 @@
+# %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.q04_mapping.build import q04_mapping
-
+from greyatomlib.pandas_guided_project.q02_append_row.build import q02_append_row
 path1 = 'data/excel-comp-data.xlsx'
 path2 = 'data/scraped.csv'
-def q05_replace_missing_values(path1,path2):
+
+def q04_mapping(path1,path2):
+    df_scrap =pd.read_csv(path2)
+    df_clean = pd.read_excel(path1)
+    mapping = pd.Series(df_scrap['US'].values,index=df_scrap['United States of America']).to_dict()
+    #df_clean.insert(loc=6, column='abbr' ,value ='nan')
+    df_clean['abbr'] =  df_clean['state'].map(mapping)
+    df_clean = df_clean[['account','name','street','city','state','postal-code','abbr','Jan','Feb','Mar']]
+    return df_clean
+
+def update_vals(row):
+    if str(row.state) == 'Mississipi' and str(row.abbr) == 'nan':
+        row.abbr  = 'MS'
+    elif  str(row.state) == 'Tenessee' and  str(row.abbr) == 'nan' :
+        row.abbr  = 'TN'
+
+    return row
+
+def q05_replace_missing_values (path1,path2):
+
+    df_final = q04_mapping(path1,path2)
+    df_final= df_final.apply(update_vals,axis=1)
+    return df_final
+
+
+
+
+
+
 
 
-#print(q05_replace_missing_values(path1,path2).shape)
diff --git a/q05_replace_missing_values/tests/__pycache__/__init__.cpython-36.pyc b/q05_replace_missing_values/tests/__pycache__/__init__.cpython-36.pyc
diff --git a/q05_replace_missing_values/tests/__pycache__/tests.cpython-36.pyc b/q05_replace_missing_values/tests/__pycache__/tests.cpython-36.pyc