commit-live-students · dhananjay93 · Sep 29, 2018 · Oct 6, 2018 · Oct 6, 2018 · Oct 7, 2018
diff --git a/__pycache__/__init__.cpython-36.pyc b/__pycache__/__init__.cpython-36.pyc
diff --git a/q01_rename_columns/__pycache__/__init__.cpython-36.pyc b/q01_rename_columns/__pycache__/__init__.cpython-36.pyc
diff --git a/q01_rename_columns/__pycache__/build.cpython-36.pyc b/q01_rename_columns/__pycache__/build.cpython-36.pyc
diff --git a/q01_rename_columns/build.py b/q01_rename_columns/build.py
@@ -1,5 +1,31 @@
+# %load q01_rename_columns/build.py
 # default imports
 import pandas as pd
+path = './data/olympics.csv'
+
+def q01_rename_columns(path):
+    df = pd.read_csv(path,skiprows = 1)
+    df.rename(columns={df.columns[0]: 'Country'},inplace =True)
+                      #'01 !': 'Gold_Summer','02 !': 'Silver_Summer','03 !': 'Bronze_Summer'})
+    #df.columns = df.columns.str.replace('01!*': 'Gold_Summer')
+   # df.columns = df.columns.str.replace('02!*': 'Silver_Summer')
+   # df.columns = df.columns.str.replace('03!*': 'Bronze_Summer')
+    df.rename(columns={'Total': 'Total_Summer', 
+                       'Total.1': 'Total_Winter', 
+                       'Combined total': 'Total', 
+                       '01 !': 'Gold_Summer',
+                       '02 !': 'Silver_Summer',
+                       '03 !': 'Bronze_Summer',
+                        '01 !.1': 'Gold_Winter',
+                       '02 !.1': 'Silver_Winter',
+                       '03 !.1': 'Bronze_Winter',
+                       '01 !.2': 'Gold_Total',
+                       '02 !.2': 'Silver_Total',
+                       '03 !.2': 'Bronze_Total',
+
+                  },inplace = True)
+    return df
+
 
 
 
diff --git a/q01_rename_columns/tests/__pycache__/__init__.cpython-36.pyc b/q01_rename_columns/tests/__pycache__/__init__.cpython-36.pyc
diff --git a/q01_rename_columns/tests/__pycache__/test.cpython-36.pyc b/q01_rename_columns/tests/__pycache__/test.cpython-36.pyc
diff --git a/q02_country_operations/__pycache__/__init__.cpython-36.pyc b/q02_country_operations/__pycache__/__init__.cpython-36.pyc
diff --git a/q02_country_operations/__pycache__/build.cpython-36.pyc b/q02_country_operations/__pycache__/build.cpython-36.pyc
diff --git a/q02_country_operations/build.py b/q02_country_operations/build.py
@@ -1,11 +1,17 @@
+# %load q02_country_operations/build.py
 # default imports
 from greyatomlib.olympics_project_new.q01_rename_columns.build import q01_rename_columns
 #Previous Functions
-path = "./data/olympics.csv"
-OlympicsDF=q01_rename_columns(path)    
-
-
+import pandas as pd
+path = './data/olympics.csv'
+OlympicsDF=q01_rename_columns(path)
 
+def q02_country_operations(OlympicsDF):
+    data = OlympicsDF.astype(str)
+    first_words = data.apply(lambda x: x.str.split().str[0])
+    first_words['Country_Name'] = first_words['Country']
+    return first_words
+
 
 
 
diff --git a/q02_country_operations/tests/__pycache__/__init__.cpython-36.pyc b/q02_country_operations/tests/__pycache__/__init__.cpython-36.pyc
diff --git a/q02_country_operations/tests/__pycache__/test.cpython-36.pyc b/q02_country_operations/tests/__pycache__/test.cpython-36.pyc
diff --git a/q03_better_event/__pycache__/__init__.cpython-36.pyc b/q03_better_event/__pycache__/__init__.cpython-36.pyc
diff --git a/q03_better_event/__pycache__/build.cpython-36.pyc b/q03_better_event/__pycache__/build.cpython-36.pyc
diff --git a/q03_better_event/build.py b/q03_better_event/build.py
@@ -1,13 +1,18 @@
+# %load q03_better_event/build.py
 #default imports
 from greyatomlib.olympics_project_new.q02_country_operations.build import q02_country_operations, q01_rename_columns
 import numpy as np
 #Previous function
-path = "./data/olympics.csv"
+path = './data/olympics.csv'
 OlympicsDF=q01_rename_columns(path)    
-OlympicsDF=q02_country_operations(OlympicsDF)
-
-
+data=q02_country_operations(OlympicsDF)
 
+def q03_better_event(data):
+    data['BetterEvent'] = 'Blank'
+    data.loc[(data['Total_Summer'] > data['Total_Winter']),'BetterEvent']='Summer'
+    data.loc[(data['Total_Summer'] < data['Total_Winter']),'BetterEvent']='Winter'
+    data.loc[(data['Total_Summer'] == data['Total_Winter']),'BetterEvent']='Both'
 
+    return data
 
 
diff --git a/q03_better_event/tests/__pycache__/__init__.cpython-36.pyc b/q03_better_event/tests/__pycache__/__init__.cpython-36.pyc
diff --git a/q03_better_event/tests/__pycache__/test.cpython-36.pyc b/q03_better_event/tests/__pycache__/test.cpython-36.pyc
diff --git a/q04_find_top_10/__pycache__/__init__.cpython-36.pyc b/q04_find_top_10/__pycache__/__init__.cpython-36.pyc
diff --git a/q04_find_top_10/__pycache__/build.cpython-36.pyc b/q04_find_top_10/__pycache__/build.cpython-36.pyc
diff --git a/q04_find_top_10/build.py b/q04_find_top_10/build.py
@@ -1,8 +1,20 @@
+# %load q04_find_top_10/build.py
 # default imports
 from greyatomlib.olympics_project_new.q03_better_event.build import q03_better_event,q02_country_operations, q01_rename_columns
-path = "./data/olympics.csv"
+path = './data/olympics.csv'
 OlympicsDF=q01_rename_columns(path)    
 OlympicsDF=q02_country_operations(OlympicsDF)
-OlympicsDF=q03_better_event(OlympicsDF)    
+df=q03_better_event(OlympicsDF) 
+# df.drop(df.tail(1).index,inplace=True)
+def q04_find_top_10(df = df, col1 = 'Total_Summer', col2 ='Total_Winter',col3 = 'Total'):
+
+    SummerList = (df.sort_values(col1,ascending = False).reset_index(drop =True))[1:11]
+    variable2 = (df.sort_values(col2,ascending = False).reset_index(drop =True))[1:11]
+    variable3 = (df.sort_values(col3,ascending = False).reset_index(drop =True))[1:11]
+    temp = list(set(list(SummerList['Country_Name'])).intersection(list(variable2['Country_Name'])))
+    variable4 = list(set(temp).intersection(list(variable3['Country_Name'])))
+    #variable4 = list(['Germany', 'Sweden', 'United States', 'Soviet Union'])
+    return list(SummerList['Country_Name']), list(variable2['Country_Name']), list(variable3['Country_Name']),variable4
+
 
 
diff --git a/q04_find_top_10/tests/__pycache__/__init__.cpython-36.pyc b/q04_find_top_10/tests/__pycache__/__init__.cpython-36.pyc
diff --git a/q04_find_top_10/tests/__pycache__/test.cpython-36.pyc b/q04_find_top_10/tests/__pycache__/test.cpython-36.pyc
diff --git a/q06_golden_winner/__pycache__/__init__.cpython-36.pyc b/q06_golden_winner/__pycache__/__init__.cpython-36.pyc
diff --git a/q06_golden_winner/__pycache__/build.cpython-36.pyc b/q06_golden_winner/__pycache__/build.cpython-36.pyc
diff --git a/q06_golden_winner/build.py b/q06_golden_winner/build.py
@@ -1,10 +1,27 @@
+# %load q06_golden_winner/build.py
 # default imports
 from greyatomlib.olympics_project_new.q04_find_top_10.build import q04_find_top_10, q03_better_event, q02_country_operations, q01_rename_columns
-path = "./data/olympics.csv"
+path = './data/olympics.csv'
 OlympicsDF=q01_rename_columns(path)    
 OlympicsDF=q02_country_operations(OlympicsDF)
 OlympicsDF=q03_better_event(OlympicsDF)    
 Top10Summer,Top10Winter, Top10, Common =q04_find_top_10(OlympicsDF,'Total_Summer', 'Total_Winter','Total')
+def q06_golden_winner(OlympicsDF , Top10Summer,Top10Winter, Top10):
+    variable1 = OlympicsDF [OlympicsDF ['Country_Name'].isin(Top10Summer)]
+    variable1['col1'] = (variable1['Gold_Summer']/variable1['Total_Summer'])
+    country_summer = variable1.sort_values('col1', axis=0, ascending=False).reset_index(drop =True)['Country_Name'][0]
+
+    variable2 = OlympicsDF [OlympicsDF ['Country_Name'].isin(Top10Winter)]
+    variable2['col2'] = (variable2['Gold_Winter']/variable2['Total_Winter'])
+    country_winter = variable2.sort_values('col2', axis=0, ascending=False).reset_index(drop =True)['Country_Name'][0]
+
+    variable3 = OlympicsDF [OlympicsDF ['Country_Name'].isin(Top10)]
+    variable3['col3'] = (variable3['Gold_Total']/variable3['Total'])
+    country_total = variable3.sort_values('col3', axis=0, ascending=False).reset_index(drop =True)['Country_Name'][0]
+
+    return country_summer,country_winter,country_total
+
+
 
 
 
diff --git a/q06_golden_winner/tests/__pycache__/__init__.cpython-36.pyc b/q06_golden_winner/tests/__pycache__/__init__.cpython-36.pyc
diff --git a/q06_golden_winner/tests/__pycache__/test.cpython-36.pyc b/q06_golden_winner/tests/__pycache__/test.cpython-36.pyc
diff --git a/q07_unusual_performances/__pycache__/__init__.cpython-36.pyc b/q07_unusual_performances/__pycache__/__init__.cpython-36.pyc
diff --git a/q07_unusual_performances/__pycache__/build.cpython-36.pyc b/q07_unusual_performances/__pycache__/build.cpython-36.pyc
diff --git a/q07_unusual_performances/build.py b/q07_unusual_performances/build.py
@@ -1,5 +1,21 @@
+# %load q07_unusual_performances/build.py
 # default imports
 from greyatomlib.olympics_project_new.q02_country_operations.build import q02_country_operations, q01_rename_columns
-path = "./data/olympics.csv"
+import numpy as np
+path = './data/olympics.csv'
 OlympicsDF=q01_rename_columns(path)    
 OlympicsDF=q02_country_operations(OlympicsDF)
+OlympicsDF = (OlympicsDF[OlympicsDF['Country_Name'] != 'Totals' ])
+df = OlympicsDF   
+
+def q07_unusual_performances(df,low , high):
+    a = df[df['Total'] <= low].Country_Name
+    b = df[df['Total'] > high].Country_Name
+    return a,b.iloc[:-1]
+
+
+
+
+#q07_unusual_performances(df,low = 0.05, high = 0.95)
+
+
diff --git a/q07_unusual_performances/tests/__pycache__/__init__.cpython-36.pyc b/q07_unusual_performances/tests/__pycache__/__init__.cpython-36.pyc
diff --git a/q07_unusual_performances/tests/__pycache__/test.cpython-36.pyc b/q07_unusual_performances/tests/__pycache__/test.cpython-36.pyc