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

Bug fix for small rows (low nr of strokes)

Browse Source
This commit is contained in:
Sander Roosendaal
2016-12-05 12:43:45 +01:00
parent 10ea7f5dc3
commit 9f39ae596f
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/dataprep.py
View File

@@ -276,7 +276,7 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
if windowsize <= 3: if windowsize <= 3:
windowsize = 5 windowsize = 5
if windowsize > 3: if windowsize > 3 and windowsize<len(hr):
spm = savgol_filter(spm,windowsize,3) spm = savgol_filter(spm,windowsize,3)
hr = savgol_filter(hr,windowsize,3) hr = savgol_filter(hr,windowsize,3)
drivelength = savgol_filter(drivelength,windowsize,3) drivelength = savgol_filter(drivelength,windowsize,3)
@@ -348,7 +348,7 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
driveenergy = rowdatadf.ix[:,'driveenergy'] driveenergy = rowdatadf.ix[:,'driveenergy']
drivelength = driveenergy/(averageforce*4.44822) drivelength = driveenergy/(averageforce*4.44822)
slip = rowdatadf.ix[:,'slip'] slip = rowdatadf.ix[:,'slip']
if windowsize > 3: if windowsize > 3 and windowsize<len(slip):
wash = savgol_filter(wash,windowsize,3) wash = savgol_filter(wash,windowsize,3)
slip = savgol_filter(slip,windowsize,3) slip = savgol_filter(slip,windowsize,3)
catch = savgol_filter(catch,windowsize,3) catch = savgol_filter(catch,windowsize,3)

8
rowers/views.py
View File

@@ -420,7 +420,7 @@ def add_workout_from_strokedata(user,importid,data,strokedata,source='c2'):
df['originalvelo'] = velo df['originalvelo'] = velo
if windowsize > 3: if windowsize > 3 and windowsize < len(velo):
velo2 = savgol_filter(velo,windowsize,3) velo2 = savgol_filter(velo,windowsize,3)
else: else:
velo2=velo velo2=velo
@@ -652,7 +652,7 @@ def add_workout_from_stdata(user,importid,data):
df['originalvelo'] = velo df['originalvelo'] = velo
if windowsize > 3: if windowsize > 3 and windowsize<len(velo):
velo2 = savgol_filter(velo,windowsize,3) velo2 = savgol_filter(velo,windowsize,3)
else: else:
velo2 = velo velo2 = velo
@@ -3635,7 +3635,7 @@ def workout_upload_view(request,message=""):
if not 'originalvelo' in row.df: if not 'originalvelo' in row.df:
row.df['originalvelo'] = velo row.df['originalvelo'] = velo
if windowsize > 3: if windowsize > 3 and windowsize<len(velo):
velo2 = savgol_filter(velo,windowsize,3) velo2 = savgol_filter(velo,windowsize,3)
else: else:
velo2 = velo velo2 = velo
@@ -3707,7 +3707,7 @@ def workout_upload_view(request,message=""):
w.save() w.save()
# put stroke data in database # put stroke data in database
res = dataprep.dataprep(row.df,id=w.id,bands=True,barchart=True,otwpower=True,empower=True) res = dataprep.dataprep(row.df,id=w.id,bands=True,barchart=True,otwpower=True,empower=True)
# Make Plot # Make Plot
if (make_plot): if (make_plot):
imagename = f1[:-4]+'.png' imagename = f1[:-4]+'.png'