dylanplummer commited on
Commit
5754989
·
1 Parent(s): 6f7a661

add area back (but good this time)

Browse files
Files changed (1) hide show
  1. app.py +11 -2
app.py CHANGED
@@ -100,6 +100,7 @@ def full_report():
100
  total_jumps = int(df['jumps'].sum())
101
  print(f"Total jumps: {total_jumps}")
102
  df['iso'] = df['iso'].map(alpha_2_map)
 
103
 
104
  country_df = df.groupby(['country', 'iso']).sum().reset_index()
105
  country_df = country_df.sort_values(by=['jumps'], ascending=False)
@@ -146,7 +147,15 @@ def full_report():
146
  df = df.groupby(['day', 'continent']).sum().reset_index()
147
  df = df.sort_values(by=['day'])
148
  df['total_jumps'] = df.groupby('continent')['jumps'].cumsum()
149
- jumps_over_time = px.line(df, x='day',
 
 
 
 
 
 
 
 
150
  y='total_jumps',
151
  color='continent',
152
  template="plotly_dark")
@@ -154,7 +163,7 @@ def full_report():
154
  daily_df = df.groupby(['day']).sum().reset_index()
155
  per_day_plot = px.scatter(daily_df, x='day', y='jumps',
156
  trendline='rolling',
157
- trendline_options=dict(window=7),
158
  trendline_color_override="goldenrod",
159
  trendline_scope='overall',
160
  template="plotly_dark")
 
100
  total_jumps = int(df['jumps'].sum())
101
  print(f"Total jumps: {total_jumps}")
102
  df['iso'] = df['iso'].map(alpha_2_map)
103
+ df['jumps'] = df['jumps'].astype(int)
104
 
105
  country_df = df.groupby(['country', 'iso']).sum().reset_index()
106
  country_df = country_df.sort_values(by=['jumps'], ascending=False)
 
147
  df = df.groupby(['day', 'continent']).sum().reset_index()
148
  df = df.sort_values(by=['day'])
149
  df['total_jumps'] = df.groupby('continent')['jumps'].cumsum()
150
+ print(df)
151
+ # fill in any missing days with current max value
152
+ for day in range(1, df['day'].max() + 1):
153
+ for continent in df['continent'].unique():
154
+ if not df[(df['day'] == day) & (df['continent'] == continent)].any().any():
155
+ max_jumps = df[(df['day'] < day) & (df['continent'] == continent)]['total_jumps'].max()
156
+ df = df.append({'day': day, 'continent': continent, 'total_jumps': max_jumps}, ignore_index=True)
157
+ df = df.sort_values(by=['day']).reset_index(drop=True)
158
+ jumps_over_time = px.area(df, x='day',
159
  y='total_jumps',
160
  color='continent',
161
  template="plotly_dark")
 
163
  daily_df = df.groupby(['day']).sum().reset_index()
164
  per_day_plot = px.scatter(daily_df, x='day', y='jumps',
165
  trendline='rolling',
166
+ trendline_options=dict(window=14),
167
  trendline_color_override="goldenrod",
168
  trendline_scope='overall',
169
  template="plotly_dark")