From 19aea9cda5eeed3687177b791ca857c7bff5266f Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 29 Jun 2017 15:36:03 +0200 Subject: [PATCH 1/2] check for delta t in CP algo --- rowers/datautils.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/rowers/datautils.py b/rowers/datautils.py index 298280d4..cd47cfea 100644 --- a/rowers/datautils.py +++ b/rowers/datautils.py @@ -175,8 +175,15 @@ def getmaxwattinterval(tt,ww,i): try: t_0 = tt.ix[indexmax] t_1 = tt.ix[indexmax-i] - deltat = 1.0e-3*(t_0-t_1) - wmax = w_roll.ix[indexmax] + deltas = tt.ix[indexmax-1:indexmax].diff().dropna() + print deltas.mean(),deltas.max() + testres = 1.0e-3*deltas.max() < 30. + if testres: + deltat = 1.0e-3*(t_0-t_1) + wmax = w_roll.ix[indexmax] + else: + wmax = 0 + deltat = 0 except KeyError: pass else: From a34fc97a353d43eb762bfdb9045828381e90538d Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 29 Jun 2017 15:36:38 +0200 Subject: [PATCH 2/2] deleted print statement --- rowers/datautils.py | 1 - 1 file changed, 1 deletion(-) diff --git a/rowers/datautils.py b/rowers/datautils.py index cd47cfea..d085f1c8 100644 --- a/rowers/datautils.py +++ b/rowers/datautils.py @@ -176,7 +176,6 @@ def getmaxwattinterval(tt,ww,i): t_0 = tt.ix[indexmax] t_1 = tt.ix[indexmax-i] deltas = tt.ix[indexmax-1:indexmax].diff().dropna() - print deltas.mean(),deltas.max() testres = 1.0e-3*deltas.max() < 30. if testres: deltat = 1.0e-3*(t_0-t_1)