sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

fixed a bug in rScore calculation

Browse Source
This commit is contained in:
Sander Roosendaal
2018-11-01 17:52:43 +01:00
parent d0e0e577f9
commit fdf399dd4c
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
rowers/tasks.py
View File

@@ -580,22 +580,34 @@ def handle_calctrimp(id,
df = rowdata.df df = rowdata.df
df['deltat'] = df[' ElapsedTime (sec)'].diff().abs() df['deltat'] = df[' ElapsedTime (sec)'].diff().abs()
duration = df['TimeStamp (sec)'].max()-df['TimeStamp (sec)'].min()
df[' Power (watts)'] = df[' Power (watts)'].abs() df2 = df.copy()
df['pwr4'] = df[' Power (watts)']**(4.0) df2['time'] = df2[' ElapsedTime (sec)']
pwr4mean = wavg(df,'pwr4','deltat') df2['time'] = df2['time'].apply(
pwrmean = wavg(df,' Power (watts)','deltat') lambda x:timedelta(seconds=x)
)
duration = df['TimeStamp (sec)'].max()-df['TimeStamp (sec)'].min()
df2 = df2.resample('30s',on='time').mean()
df2[' Power (watts)'] = df2[' Power (watts)'].abs()
df2['pwr4'] = df2[' Power (watts)']**(4.0)
# pwr4mean = wavg(df,'pwr4','deltat')
pwr4mean = df2['pwr4'].mean()
pwrmean = df2[' Power (watts)'].mean()
# pwrmean = wavg(df,' Power (watts)','deltat')
if pwr4mean > 0: if pwr4mean > 0:
normp = (pwr4mean)**(0.25) normp = (pwr4mean)**(0.25)
else: else:
normp = pwrmean normp = pwrmean
intensityfactor = pwrmean/float(ftp)
intensityfactor = normp/float(ftp) intensityfactor = normp/float(ftp)
tss = 100.*((duration*normp*intensityfactor)/(3600.*ftp)) tss = 100.*((duration*normp*intensityfactor)/(3600.*ftp))
if sex == 'male': if sex == 'male':
f = 1.92 f = 1.92
else: else: