From 8903040d11fe8cee69b8778a8d777c3189ec5160 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 1 Nov 2018 19:43:04 +0100 Subject: [PATCH] refined rScore --- rowers/tasks.py | 6 ++++-- rowers/urls.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/rowers/tasks.py b/rowers/tasks.py index c3b7bf41..d0df13bd 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -589,8 +589,9 @@ def handle_calctrimp(id, ) duration = df['TimeStamp (sec)'].max()-df['TimeStamp (sec)'].min() - df2 = df2.resample('30s',on='time').mean() - + df2 = df2.resample('1s',on='time').mean() + df2.fillna(method='ffill',inplace=True) + df2 = df2.rolling(30).mean() df2[' Power (watts)'] = df2[' Power (watts)'].abs() @@ -607,6 +608,7 @@ def handle_calctrimp(id, intensityfactor = normp/float(ftp) tss = 100.*((duration*normp*intensityfactor)/(3600.*ftp)) + print tss if sex == 'male': f = 1.92 diff --git a/rowers/urls.py b/rowers/urls.py index 489b093f..0807ffef 100644 --- a/rowers/urls.py +++ b/rowers/urls.py @@ -170,7 +170,7 @@ urlpatterns = [ url(r'^team-compare-select/workout/(?P\d+)/user/(?P\d+)/$',views.team_comparison_select), url(r'^team-compare-select/team/(?P\d+)/user/(?P\d+)/$',views.team_comparison_select), url(r'^team-compare-select/workout/(?P\d+)/$',views.team_comparison_select), - url(r'^team-compare-select/team/(?P\d+)$',views.team_comparison_select), + url(r'^team-compare-select/team/(?P\d+)/$',views.team_comparison_select), url(r'^team-compare-select/$',views.team_comparison_select), url(r'^workouts-join-select/team/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)$',views.workouts_join_select), url(r'^workouts-join$',views.workouts_join_view),