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

passing tests - saving goldmedal score

Browse Source
This commit is contained in:
Sander Roosendaal
2020-12-05 13:31:02 +01:00
parent 473198b88b
commit 1dd0c0cff9
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rowers/dataprep.py
View File

@@ -1083,7 +1083,7 @@ def fitscore(rower,workout):
indexmax = scores.idxmax() indexmax = scores.idxmax()
delta = df.loc[indexmax,'delta'] delta = df.loc[indexmax,'delta']
maxvalue = scores.max() maxvalue = scores.max()
except ValueError: except (ValueError,TypeError):
indexmax = 0 indexmax = 0
delta = 0 delta = 0
maxvalue = 0 maxvalue = 0
@@ -1150,6 +1150,9 @@ def setcp(workout,background=False):
'id':workout.id, 'id':workout.id,
}) })
df.to_parquet(filename,engine='fastparquet',compression='GZIP') df.to_parquet(filename,engine='fastparquet',compression='GZIP')
goldmedalstandard, goldmedalduration = fitscore(workout.user,workout)
workout.goldmedalstandard = goldmedalstandard
workout.save()
return df,delta,cpvalues return df,delta,cpvalues
return pd.DataFrame({'delta':[],'cp':[]}),pd.Series(),pd.Series() return pd.DataFrame({'delta':[],'cp':[]}),pd.Series(),pd.Series()

3
rowers/utils.py
View File

@@ -327,7 +327,10 @@ def calculate_age(born,today=None):
if not today: if not today:
today = date.today() today = date.today()
if born: if born:
try:
return today.year - born.year - ((today.month, today.day) < (born.month, born.day)) return today.year - born.year - ((today.month, today.day) < (born.month, born.day))
except AttributeError:
return None
else: else:
return None return None