From 7b7171ca0fbca58989517a0b7f7ebbc334a0a6b7 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 8 Jul 2018 21:34:03 +0200 Subject: [PATCH] bug fix in trimp calc --- rowers/tasks.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/rowers/tasks.py b/rowers/tasks.py index cef30175..ab35bed2 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -594,16 +594,22 @@ def handle_calctrimp(id, else: f = 1.67 - dt = df['TimeStamp (sec)'].diff()/6.e4 + dt = df['TimeStamp (sec)'].diff()/60. hrr = (df[' HRCur (bpm)']-hrmin)/(hrmax-hrmin) hrrftp = (hrftp-hrmin)/float(hrmax-hrmin) - trimp1hr = 60*hrrftp*0.64*np.exp(f*hrrftp) + trimp1hr = 60.*hrrftp*0.64*np.exp(f*hrrftp) trimpdata = dt*hrr*0.64*np.exp(f*hrr) trimp = trimpdata.sum() - hrtss = 100*trimp/trimp1hr + print hrr.mean() + + print trimp + + hrtss = 100.*trimp/trimp1hr + + print hrtss,trimp1hr pp = 8.0