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

TSS calculation now always includes rest strokes

Browse Source
This commit is contained in:
Sander Roosendaal
2018-02-13 08:18:17 +01:00
parent 3a30c7dafc
commit ae0e0650e8
3 changed files with 19 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rowers/dataprep.py
View File

@@ -2217,7 +2217,7 @@ def dataprep(rowdatadf, id=0, bands=True, barchart=True, otwpower=True,
def workout_trimp(workout):
r = workout.user
df,row = getrowdata_db(id=workout.id)
df = clean_df_stats(df)
df = clean_df_stats(df,workstrokesonly=False)
if df.empty:
df,row = getrowdata_db(id=workout.id)
df = clean_df_stats(df,workstrokesonly=False)
@@ -2229,7 +2229,7 @@ def workout_trimp(workout):
def workout_rscore(w):
r = w.user
df,row = getrowdata_db(id=w.id)
df = clean_df_stats(df)
df = clean_df_stats(df,workstrokesonly=False)
if df.empty:
df,row = getrowdata_db(id=w.id)
df = clean_df_stats(df,workstrokesonly=False)
@@ -2249,4 +2249,4 @@ def workout_rscore(w):
else:
tss = 0
return tss
return tss,normp