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

fixed bug related to split after rowing physics calc

Browse Source
This commit is contained in:
Sander Roosendaal
2017-08-29 10:22:38 +02:00
parent 5bb5f6668b
commit 384ad4871e
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rowers/dataprep.py
View File

@@ -1421,7 +1421,7 @@ def add_efficiency(id=0):
# saves it to the stroke_data table in the database # saves it to the stroke_data table in the database
# Takes a rowingdata object's DataFrame as input # Takes a rowingdata object's DataFrame as input
def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True, def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
empower=True,inboard=0.88): empower=True,inboard=0.88,forceunit='lbs'):
if rowdatadf.empty: if rowdatadf.empty:
return 0 return 0
@@ -1485,8 +1485,17 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
except TypeError: except TypeError:
drivespeed = 0.0*rowdatadf['TimeStamp (sec)'] drivespeed = 0.0*rowdatadf['TimeStamp (sec)']
drivespeed = drivespeed.fillna(value=0) drivespeed = drivespeed.fillna(value=0)
try:
driveenergy = rowdatadf['driveenergy']
except KeyError:
if forceunit == 'lbs':
driveenergy = drivelength*averageforce*lbstoN driveenergy = drivelength*averageforce*lbstoN
else:
drivenergy = drivelength*averageforce
distance = rowdatadf.ix[:,'cum_dist'] distance = rowdatadf.ix[:,'cum_dist']

1
rowers/interactiveplots.py
View File

@@ -1918,7 +1918,6 @@ def interactive_flex_chart2(id=0,promember=0,
yparam1 = 'None' yparam1 = 'None'
rowdata.dropna(axis=1,how='all',inplace=True) rowdata.dropna(axis=1,how='all',inplace=True)
rowdata.dropna(axis=0,how='any',inplace=True)
# test if we have drive energy # test if we have drive energy
nowork = 1 nowork = 1