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

hotfix hrftp

Browse Source
This commit is contained in:
Sander Roosendaal
2018-04-09 18:27:25 +02:00
parent b084b65ad5
commit 7edefc2373
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rowers/metrics.py
View File

@@ -352,8 +352,9 @@ def calc_trimp(df,sex,hrmax,hrmin,hrftp):
dt = df['time'].diff()/6.e4
hrr = (df['hr']-hrmin)/(hrmax-hrmin)
hrrftp = (hrftp-hrmin)/(hrmax-hrmin)
hrrftp = (hrftp-hrmin)/float(hrmax-hrmin)
trimp1hr = 60*hrrftp*0.64*np.exp(f*hrrftp)
trimpdata = dt*hrr*0.64*np.exp(f*hrr)
trimp = trimpdata.sum()