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

fix

Browse Source
This commit is contained in:
Sander Roosendaal
2020-12-11 08:10:18 +01:00
parent 3ec90029be
commit ae816d2e7d
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rowers/dataprep.py
View File

@@ -1075,15 +1075,15 @@ def workout_goldmedalstandard(workout):
else: else:
return 0,0 return 0,0
def calculate_goldmedalstandard(rower,workout): def calculate_goldmedalstandard(rower,workout,recurrance=True):
cpfile = 'media/cpdata_{id}.parquet.gz'.format(id=workout.id) cpfile = 'media/cpdata_{id}.parquet.gz'.format(id=workout.id)
try: try:
df = pd.read_parquet(cpfile) df = pd.read_parquet(cpfile)
except: except:
df, delta, cpvalues = setcp(workout) df, delta, cpvalues = setcp(workout)
if df.empty: if df.empty and recurrance:
df, delta, cpvalues = setcp(workout) df, delta, cpvalues = setcp(workout,recurrance=False)
age = calculate_age(rower.birthdate,today=workout.date) age = calculate_age(rower.birthdate,today=workout.date)
@@ -1178,7 +1178,7 @@ def fetchcp_new(rower,workouts):
return df['delta'],df['cp'],0,df['workout'] return df['delta'],df['cp'],0,df['workout']
def setcp(workout,background=False): def setcp(workout,background=False,recurrance=True):
filename = 'media/cpdata_{id}.parquet.gz'.format(id=workout.id) filename = 'media/cpdata_{id}.parquet.gz'.format(id=workout.id)
strokesdf = getsmallrowdata_db(['power','workoutid','time'],ids = [workout.id]) strokesdf = getsmallrowdata_db(['power','workoutid','time'],ids = [workout.id])
@@ -1209,7 +1209,8 @@ 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 = calculate_goldmedalstandard(workout.user,workout) if recurrance:
goldmedalstandard, goldmedalduration = calculate_goldmedalstandard(workout.user,workout)
workout.goldmedalstandard = goldmedalstandard workout.goldmedalstandard = goldmedalstandard
workout.goldmedalduration = goldmedalduration workout.goldmedalduration = goldmedalduration
workout.save() workout.save()