diff --git a/__pycache__/__init__.cpython-36.pyc b/__pycache__/__init__.cpython-36.pyc index b4b7209..387e524 100644 Binary files a/__pycache__/__init__.cpython-36.pyc and b/__pycache__/__init__.cpython-36.pyc differ diff --git a/q01_load_data/__pycache__/__init__.cpython-36.pyc b/q01_load_data/__pycache__/__init__.cpython-36.pyc index 92b3ac2..893ba43 100644 Binary files a/q01_load_data/__pycache__/__init__.cpython-36.pyc and b/q01_load_data/__pycache__/__init__.cpython-36.pyc differ diff --git a/q01_load_data/__pycache__/build.cpython-36.pyc b/q01_load_data/__pycache__/build.cpython-36.pyc index e27baf6..c200adc 100644 Binary files a/q01_load_data/__pycache__/build.cpython-36.pyc and b/q01_load_data/__pycache__/build.cpython-36.pyc differ diff --git a/q01_load_data/build.py b/q01_load_data/build.py index 69d7209..97f5de2 100644 --- a/q01_load_data/build.py +++ b/q01_load_data/build.py @@ -1,5 +1,12 @@ import pandas as pd - def q01_load_data(path): - "write your solution here" + path='data/excel-comp-data.xlsx' + data = pd.read_excel(path) + #data['state']= map(lambda x: x.lower(), data['state']) + df1=data['state'].str.lower() + data['state']=df1 + data['total']=data['Jan']+data['Feb']+data['Mar'] + 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 2a2dfc7..153ae50 100644 Binary files a/q01_load_data/tests/__pycache__/__init__.cpython-36.pyc and b/q01_load_data/tests/__pycache__/__init__.cpython-36.pyc differ diff --git a/q01_load_data/tests/__pycache__/tests.cpython-36.pyc b/q01_load_data/tests/__pycache__/tests.cpython-36.pyc index 76e04c8..21ca302 100644 Binary files a/q01_load_data/tests/__pycache__/tests.cpython-36.pyc and b/q01_load_data/tests/__pycache__/tests.cpython-36.pyc differ diff --git a/q02_append_row/__pycache__/__init__.cpython-36.pyc b/q02_append_row/__pycache__/__init__.cpython-36.pyc index de0cf61..10b45d9 100644 Binary files a/q02_append_row/__pycache__/__init__.cpython-36.pyc and b/q02_append_row/__pycache__/__init__.cpython-36.pyc differ diff --git a/q02_append_row/__pycache__/build.cpython-36.pyc b/q02_append_row/__pycache__/build.cpython-36.pyc index 5088267..5ca20fa 100644 Binary files a/q02_append_row/__pycache__/build.cpython-36.pyc and b/q02_append_row/__pycache__/build.cpython-36.pyc differ diff --git a/q02_append_row/build.py b/q02_append_row/build.py index af3701d..866e888 100644 --- a/q02_append_row/build.py +++ b/q02_append_row/build.py @@ -1,12 +1,25 @@ import pandas as pd -import sys, os +#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 +#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" - +def q01_load_data(path): + data = pd.read_excel(path) + df1=data['state'].str.lower() + data['state']=df1 + data['total']=data['Jan']+data['Feb']+data['Mar'] + return data +def q02_append_row(path): + df=q01_load_data(path) + sum_jan=sum(df['Jan']) + sum_feb=sum(df['Feb']) + sum_mar=sum(df['Mar']) + sum_tot=sum(df['total']) + s = pd.Series([sum_jan, sum_feb, sum_mar, sum_tot], index=['Jan', 'Feb','Mar', 'total']) + df = df.append(s,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 index dab3eca..ad0065d 100644 Binary files a/q02_append_row/tests/__pycache__/__init__.cpython-36.pyc and b/q02_append_row/tests/__pycache__/__init__.cpython-36.pyc differ diff --git a/q02_append_row/tests/__pycache__/tests.cpython-36.pyc b/q02_append_row/tests/__pycache__/tests.cpython-36.pyc index 742ee79..1bb75ff 100644 Binary files a/q02_append_row/tests/__pycache__/tests.cpython-36.pyc and b/q02_append_row/tests/__pycache__/tests.cpython-36.pyc differ