From ae816d2e7dea520b38cb183aac5ff6639ee62941 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 11 Dec 2020 08:10:18 +0100 Subject: [PATCH] fix --- rowers/dataprep.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 844693e7..6e687a7b 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -1075,15 +1075,15 @@ def workout_goldmedalstandard(workout): else: 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) try: df = pd.read_parquet(cpfile) except: df, delta, cpvalues = setcp(workout) - if df.empty: - df, delta, cpvalues = setcp(workout) + if df.empty and recurrance: + df, delta, cpvalues = setcp(workout,recurrance=False) 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'] -def setcp(workout,background=False): +def setcp(workout,background=False,recurrance=True): filename = 'media/cpdata_{id}.parquet.gz'.format(id=workout.id) strokesdf = getsmallrowdata_db(['power','workoutid','time'],ids = [workout.id]) @@ -1209,7 +1209,8 @@ def setcp(workout,background=False): 'id':workout.id, }) 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.goldmedalduration = goldmedalduration workout.save()