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

Merge tag 'v2.04' into develop

Browse Source 
dataprep fixes for f=0
This commit is contained in:
Sander Roosendaal
2017-04-14 07:48:59 +02:00
parent d1ac11bfa0 a1b3f5c833
commit 34b5d420ee
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rowers/dataprep.py
View File

@@ -362,7 +362,10 @@ def save_workout_database(f2,r,dosmooth=True,workouttype='rower',
velo = 500./pace velo = 500./pace
f = row.df['TimeStamp (sec)'].diff().mean() f = row.df['TimeStamp (sec)'].diff().mean()
windowsize = 2*(int(10./(f)))+1 if f !=0:
windowsize = 2*(int(10./(f)))+1
else:
windowsize = 1
if not 'originalvelo' in row.df: if not 'originalvelo' in row.df:
row.df['originalvelo'] = velo row.df['originalvelo'] = velo
@@ -1053,7 +1056,10 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
rhythm = 0.0*forceratio rhythm = 0.0*forceratio
f = rowdatadf['TimeStamp (sec)'].diff().mean() f = rowdatadf['TimeStamp (sec)'].diff().mean()
windowsize = 2*(int(10./(f)))+1 if f != 0:
windowsize = 2*(int(10./(f)))+1
else:
windowsize = 1
if windowsize <= 3: if windowsize <= 3:
windowsize = 5 windowsize = 5