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

Merge branch 'feature/bikeerg' into develop

Browse Source
This commit is contained in:
Sander Roosendaal
2018-08-28 09:43:28 +02:00
parent 5243bb4016 92a696a43c
commit 18b8f96418
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rowers/dataprep.py
+2
View File
@@ -871,6 +871,8 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
# auto smoothing # auto smoothing
pace = row.df[' Stroke500mPace (sec/500m)'].values pace = row.df[' Stroke500mPace (sec/500m)'].values
velo = 500. / pace velo = 500. / pace
if workouttype == 'bikeerg':
velo = 1000. / pace
f = row.df['TimeStamp (sec)'].diff().mean() f = row.df['TimeStamp (sec)'].diff().mean()
if f != 0 and not np.isnan(f): if f != 0 and not np.isnan(f):
rowers/types.py
+1
View File
@@ -2,6 +2,7 @@ workouttypes = (
('water','Standard Racing Shell'), ('water','Standard Racing Shell'),
('rower','Indoor Rower'), ('rower','Indoor Rower'),
('skierg','Ski Erg'), ('skierg','Ski Erg'),
('bike','Bike Erg'),
('dynamic','Dynamic Indoor Rower'), ('dynamic','Dynamic Indoor Rower'),
('slides','Indoor Rower on Slides'), ('slides','Indoor Rower on Slides'),
('paddle','Paddle Adapter'), ('paddle','Paddle Adapter'),