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

bugfix

Browse Source
This commit is contained in:
Sander Roosendaal
2017-09-15 15:34:30 +02:00
parent 7d6e778625
commit 55049532e4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rowers/dataprep.py
View File

@@ -1180,13 +1180,13 @@ def getsmallrowdata_db(columns,ids=[],doclean=True,workstrokesonly=True):
# convert newtons # convert newtons
if 'peakforce' in columns: if 'peakforce' in columns:
funits = ((w.id,w.forceunit) for Workout.objects.filter(id__in=ids)) funits = ((w.id,w.forceunit) for w in Workout.objects.filter(id__in=ids))
for id,u in funits: for id,u in funits:
if u=='lbs': if u=='lbs':
mask = data['workoutid']==id mask = data['workoutid']==id
data.loc[mask,'peakforce'] = data.loc[mask,'peakforce']*lbstoN data.loc[mask,'peakforce'] = data.loc[mask,'peakforce']*lbstoN
if 'averageforce' in columns: if 'averageforce' in columns:
funits = ((w.id,w.forceunit) for Workout.objects.filter(id__in=ids)) funits = ((w.id,w.forceunit) for w in Workout.objects.filter(id__in=ids))
for id,u in funits: for id,u in funits:
if u=='lbs': if u=='lbs':
mask = data['workoutid']==id mask = data['workoutid']==id
@@ -1294,13 +1294,13 @@ def read_cols_df_sql(ids,columns,convertnewtons=True):
df = df.fillna(value=0) df = df.fillna(value=0)
if 'peakforce' in columns: if 'peakforce' in columns:
funits = ((w.id,w.forceunit) for Workout.objects.filter(id__in=ids)) funits = ((w.id,w.forceunit) for w in Workout.objects.filter(id__in=ids))
for id,u in funits: for id,u in funits:
if u=='lbs': if u=='lbs':
mask = data['workoutid']==id mask = data['workoutid']==id
df.loc[mask,'peakforce'] = data.loc[mask,'peakforce']*lbstoN df.loc[mask,'peakforce'] = data.loc[mask,'peakforce']*lbstoN
if 'averageforce' in columns: if 'averageforce' in columns:
funits = ((w.id,w.forceunit) for Workout.objects.filter(id__in=ids)) funits = ((w.id,w.forceunit) for w in Workout.objects.filter(id__in=ids))
for id,u in funits: for id,u in funits:
if u=='lbs': if u=='lbs':
mask = data['workoutid']==id mask = data['workoutid']==id