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

Merge branch 'release/v14.65'

Browse Source
This commit is contained in:
Sander Roosendaal
2020-11-25 11:24:15 +01:00
parent 3fe5276008 5f683d1e2e
commit aea8d5e4e0
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rowers/interactiveplots.py
View File

@@ -1579,17 +1579,19 @@ def fitnessfit_chart(workouts,user,workoutmode='water',startdate=None,
ids = [w.id for w in workouts.filter(date__gte=w.date-datetime.timedelta(days=kfitness), ids = [w.id for w in workouts.filter(date__gte=w.date-datetime.timedelta(days=kfitness),
date__lte=w.date)] date__lte=w.date)]
powerdf = df[df['workout'].isin(ids)] try:
powerdf = df[df['workout'].isin(ids)]
powerdf = powerdf[powerdf['cp'] == powerdf.groupby(['delta'])['cp'].transform('max')] powerdf = powerdf[powerdf['cp'] == powerdf.groupby(['delta'])['cp'].transform('max')]
powerdf = powerdf.sort_values(['delta']).reset_index() powerdf = powerdf.sort_values(['delta']).reset_index()
powerdf = powerdf[powerdf['cp']>0] powerdf = powerdf[powerdf['cp']>0]
powerdf.dropna(axis=0,inplace=True) powerdf.dropna(axis=0,inplace=True)
powerdf.sort_values(['delta','cp'],ascending=[1,0],inplace=True) powerdf.sort_values(['delta','cp'],ascending=[1,0],inplace=True)
powerdf.drop_duplicates(subset='delta',keep='first',inplace=True) powerdf.drop_duplicates(subset='delta',keep='first',inplace=True)
except KeyError:
powerdf = pd.DataFrame()
# p1,fitt,fitpower,ratio = datautils.cpfit(powerdf) # p1,fitt,fitpower,ratio = datautils.cpfit(powerdf)
if len(powerdf['delta'])>= 4: if len(powerdf['delta'])>= 4: