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

OTW physics

Browse Source
This commit is contained in:
Sander Roosendaal
2016-12-01 20:59:48 +01:00
parent d7fb32923a
commit 6b2e474d7b
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rowers/dataprep.py
View File

@@ -363,8 +363,6 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
data['peakforceangle'] = peakforceangle data['peakforceangle'] = peakforceangle
data['driveenergy'] = driveenergy data['driveenergy'] = driveenergy
data['drivelength'] = drivelength data['drivelength'] = drivelength
data['peakforce'] = peakforce
data['averageforce'] = averageforce
except KeyError: except KeyError:
pass pass
@@ -378,18 +376,18 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
except KeyError: except KeyError:
equivergpower = 0*p+50. equivergpower = 0*p+50.
#nowindpace = nowindpace.apply(lambda x: timedeltaconv(x)) nowindpace2 = nowindpace.apply(lambda x: timedeltaconv(x))
ergvelo = (equivergpower/2.8)**(1./3.) ergvelo = (equivergpower/2.8)**(1./3.)
ergpace = 500./ergvelo ergpace = 500./ergvelo
ergpace[ergpace == np.inf] = 240. ergpace[ergpace == np.inf] = 240.
#ergpace = ergpace.apply(lambda x: timedeltaconv(x)) ergpace2 = ergpace.apply(lambda x: timedeltaconv(x))
data['ergpace'] = ergpace data['ergpace'] = ergpace*1e3
data['nowindpace'] = nowindpace data['nowindpace'] = nowindpace*1e3
data['equivergpower'] = equivergpower data['equivergpower'] = equivergpower
data['fergpace'] = nicepaceformat(ergpace) data['fergpace'] = nicepaceformat(ergpace2)
data['fnowindpace'] = nicepaceformat(nowindpace) data['fnowindpace'] = nicepaceformat(nowindpace2)
data = data.replace([-np.inf,np.inf],np.nan) data = data.replace([-np.inf,np.inf],np.nan)
data = data.fillna(method='ffill') data = data.fillna(method='ffill')

4
rowers/views.py
View File

@@ -3705,7 +3705,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) 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):
@@ -4643,7 +4643,7 @@ def strokedatajson(request,id):
hrtr=r.tr,hran=r.an,ftp=r.ftp) hrtr=r.tr,hran=r.an,ftp=r.ftp)
rowdata = rdata(row.csvfilename,rower=rr).df rowdata = rdata(row.csvfilename,rower=rr).df
datadf = dataprep.dataprep(rowdata,id=row.id,bands=True,barchart=True,otwpower=True) datadf = dataprep.dataprep(rowdata,id=row.id,bands=True,barchart=True,otwpower=True,empower=True)
# mangling # mangling
# #