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

adding gold medal durations

Browse Source
This commit is contained in:
Sander Roosendaal
2020-12-07 08:54:50 +01:00
parent 0bb0237aee
commit 939a3e27c0
7 changed files with 70 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
rowers/dataprep.py
View File

@@ -1028,13 +1028,17 @@ from scipy import optimize
def workout_goldmedalstandard(workout):
if workout.goldmedalstandard > 0:
return workout.goldmedalstandard
goldmedalstandard,goldmedalduration = fitscore(workout.user,workout)
workout.goldmedalstandard = goldmedalstandard
workout.save()
return goldmedalstandard
return workout.goldmedalstandard,workout.goldmedalseconds
if workout.workouttype in rowtypes:
goldmedalstandard,goldmedalseconds = calculate_goldmedalstandard(workout.user,workout)
workout.goldmedalstandard = goldmedalstandard
workout.goldmedalseconds = goldmedalseconds
workout.save()
return goldmedalstandard, goldmedalseconds
else:
return 0,0
def fitscore(rower,workout):
def calculate_goldmedalstandard(rower,workout):
cpfile = 'media/cpdata_{id}.parquet.gz'.format(id=workout.id)
try:
df = pd.read_parquet(cpfile)
@@ -1100,7 +1104,7 @@ def fitscore(rower,workout):
try:
indexmax = scores.idxmax()
delta = df.loc[indexmax,'delta']
delta = int(df.loc[indexmax,'delta'])
maxvalue = scores.max()
except (ValueError,TypeError):
indexmax = 0
@@ -1168,8 +1172,9 @@ def setcp(workout,background=False):
'id':workout.id,
})
df.to_parquet(filename,engine='fastparquet',compression='GZIP')
goldmedalstandard, goldmedalduration = fitscore(workout.user,workout)
goldmedalstandard, goldmedalduration = calculate_goldmedalstandard(workout.user,workout)
workout.goldmedalstandard = goldmedalstandard
workout.goldmedalduration = goldmedalduration
workout.save()
return df,delta,cpvalues
@@ -2601,7 +2606,10 @@ def read_df_sql(id):
rowdata,row = getrowdata(id=id)
if rowdata and len(rowdata.df):
data = dataprep(rowdata.df,id=id,bands=True,otwpower=True,barchart=True)
df = pd.read_parquet(f)
try:
df = pd.read_parquet(f)
except OSError:
df = data
else:
df = pd.DataFrame()