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

fixed some workoutstate errors

Browse Source
This commit is contained in:
Sander Roosendaal
2020-04-13 13:39:31 +02:00
parent 61a10a1dfa
commit d2fb2274f4
3 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rowers/c2stuff.py
View File

@@ -1054,6 +1054,7 @@ def add_workout_from_data(user,importid,data,strokedata,
' AverageDriveForce (lbs)':np.zeros(nr_rows), ' AverageDriveForce (lbs)':np.zeros(nr_rows),
' PeakDriveForce (lbs)':np.zeros(nr_rows), ' PeakDriveForce (lbs)':np.zeros(nr_rows),
' lapIdx':lapidx, ' lapIdx':lapidx,
' WorkoutState': 4,
' ElapsedTime (sec)':seconds ' ElapsedTime (sec)':seconds
}) })

12
rowers/dataprep.py
View File

@@ -512,6 +512,12 @@ def clean_df_stats(datadf, workstrokesonly=True, ignorehr=True,
except (KeyError,TypeError) as e: except (KeyError,TypeError) as e:
pass pass
# protect 0 workoutstate values from being nulled
try:
datadf['workoutstate'] = datadf['workoutstate'] + 1
except (KeyError,TypeError) as e:
pass
try: try:
datadf = datadf.clip(lower=0) datadf = datadf.clip(lower=0)
@@ -545,6 +551,12 @@ def clean_df_stats(datadf, workstrokesonly=True, ignorehr=True,
except (TypeError,KeyError) as e: except (TypeError,KeyError) as e:
pass pass
# bring workoutstate back to real values
try:
datadf['workoutstate'] = datadf['workoutstate'] - 1
except (TypeError,KeyError) as e:
pass
# return from positive domain to negative # return from positive domain to negative
try: try:

1
rowers/dataprepnodjango.py
View File

@@ -291,6 +291,7 @@ def add_c2_stroke_data_db(strokedata,workoutid,starttimeunix,csvfilename,
' AverageDriveForce (lbs)':np.zeros(nr_rows), ' AverageDriveForce (lbs)':np.zeros(nr_rows),
' PeakDriveForce (lbs)':np.zeros(nr_rows), ' PeakDriveForce (lbs)':np.zeros(nr_rows),
' lapIdx':lapidx, ' lapIdx':lapidx,
' WorkoutState': 4,
' ElapsedTime (sec)':seconds, ' ElapsedTime (sec)':seconds,
'cum_dist': dist2 'cum_dist': dist2
}) })