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

perf chart and gms chart now use rankingpiece

Browse Source
This commit is contained in:
Sander Roosendaal
2021-01-06 21:58:28 +01:00
parent 67fc069cf6
commit 44669eaa5d
2 changed files with 27 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rowers/dataprep.py
View File

@@ -1104,10 +1104,15 @@ def workout_goldmedalstandard(workout):
def check_marker(workout): def check_marker(workout):
r = workout.user r = workout.user
gmstandard,gmseconds = workout_goldmedalstandard(workout)
if gmseconds<60:
return None
dd = arrow.get(workout.date).datetime-datetime.timedelta(days=r.kfit) dd = arrow.get(workout.date).datetime-datetime.timedelta(days=r.kfit)
ws = Workout.objects.filter(date__gte=dd, ws = Workout.objects.filter(date__gte=dd,
date__lte=workout.date, date__lte=workout.date,
user=r,duplicate=False, user=r,duplicate=False,
workouttype__in=mytypes.rowtypes,
).order_by("date") ).order_by("date")
ids = [] ids = []
gms = [] gms = []

62
rowers/interactiveplots.py
View File

@@ -1801,9 +1801,17 @@ def goldmedalscorechart(user,startdate=None,enddate=None):
duplicate=False) duplicate=False)
# marker workouts # marker workouts
dates,testpower,testduration,fatigues,fitnesses,impulses, outids = build_goldmedalstandards( workouts = Workout.objects.filter(user=user.rower,date__gte=startdate,
workouts,42 date__lte=enddate,
) workouttype__in=mytypes.rowtypes,
duplicate=False).order_by('date')
markerworkouts = workouts.filter(rankingpiece=True)
outids = [w.id for w in markerworkouts]
dates = [arrow.get(w.date).datetime for w in markerworkouts]
testpower = [w.goldmedalstandard if w.rankingpiece else np.nan for w in markerworkouts]
testduration = [w.goldmedalseconds if w.rankingpiece else 0 for w in markerworkouts]
df = pd.DataFrame({ df = pd.DataFrame({
'id':outids, 'id':outids,
@@ -1813,8 +1821,8 @@ def goldmedalscorechart(user,startdate=None,enddate=None):
}) })
df.sort_values(['date'],inplace=True) df.sort_values(['date'],inplace=True)
df['testdup'] = df['testpower'].shift(1) #df['testdup'] = df['testpower'].shift(1)
df['testpower'] = df.apply(lambda x: newtestpower(x),axis=1) #df['testpower'] = df.apply(lambda x: newtestpower(x),axis=1)
#df['date'] = df.apply(lambda x: newtestpowerdate(x), axis=1) #df['date'] = df.apply(lambda x: newtestpowerdate(x), axis=1)
@@ -1985,41 +1993,16 @@ def performance_chart(user,startdate=None,enddate=None,kfitness=42,kfatigue=7,
workouts = Workout.objects.filter(user=user.rower,date__gte=startdate, workouts = Workout.objects.filter(user=user.rower,date__gte=startdate,
date__lte=enddate, date__lte=enddate,
workouttype__in=mytypes.rowtypes, workouttype__in=mytypes.rowtypes,
duplicate=False) duplicate=False).order_by('date')
dates,testpower,testduration,fatigues,fitnesses,impulses, outids = build_goldmedalstandards(
workouts,kfitness
)
markerworkouts = workouts.filter(rankingpiece=True)
df = pd.DataFrame({ outids = [w.id for w in markerworkouts]
'id': outids, dates = [arrow.get(w.date).datetime for w in workouts]
'date':dates, testpower = [w.goldmedalstandard if w.rankingpiece else np.nan for w in workouts]
'testpower':testpower, impulses = [np.nan for w in workouts]
'testduration':testduration, testduration = [w.goldmedalseconds if w.rankingpiece else 0 for w in workouts]
'fatigue':fatigues, fitnesses = [np.nan for w in workouts]
'fitness':fitnesses, fatigues = [np.nan for w in workouts]
'impulse':impulses,
})
df.sort_values(['date'],inplace=True)
if showtests:
df['testdup'] = df['testpower'].shift(1)
df['testpower'] = df.apply(lambda x: newtestpower(x),axis=1)
df['id'] = df.apply(lambda x: newtestpowerid(x),axis=1)
#try:
# df['testpower'].iloc[-1] = df['testdup'].iloc[-1]
#except IndexError:
# pass
dates = [d for d in df['date']]
testpower = df['testpower'].values.tolist()
fatigues = df['fatigue'].values.tolist()
fitnesses = df['fitness'].values.tolist()
testduration = df['testduration'].values.tolist()
impulses = df['impulse'].tolist()
outids = df['id'].unique()
fatigues,fitnesses,dates,testpower,testduration,impulses = getfatigues(fatigues, fatigues,fitnesses,dates,testpower,testduration,impulses = getfatigues(fatigues,
fitnesses, fitnesses,
@@ -2031,7 +2014,6 @@ def performance_chart(user,startdate=None,enddate=None,kfitness=42,kfatigue=7,
kfatigue,kfitness) kfatigue,kfitness)
df = pd.DataFrame({ df = pd.DataFrame({
'date':dates, 'date':dates,
'testpower':testpower, 'testpower':testpower,