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

separate summing

Browse Source
This commit is contained in:
Sander Roosendaal
2020-11-24 20:18:13 +01:00
parent 22d3e340d4
commit 1253e00186
1 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
rowers/interactiveplots.py
View File

@@ -1594,20 +1594,29 @@ def fitnessfit_chart(workouts,user,workoutmode='water',startdate=None,
dates.append(datetime.datetime.combine(w.date,datetime.datetime.min.time())) dates.append(datetime.datetime.combine(w.date,datetime.datetime.min.time()))
testpower.append(powertest) testpower.append(powertest)
fatigues.append(np.nan)
fitnesses.append(np.nan)
# create Fitness and Fatigue number
fatigue = 0 allworkouts = Workout.objects.filter(user=user.rower,date__lte=enddate,
fitness = 0 date__gte=startdate)
previousworkouts = Workout.objects.filter(user=user.rower,date__lte=w.date, for w in allworkouts:
# create Fitness and Fatigue number
fatigue = 0
fitness = 0
previousworkouts = Workout.objects.filter(user=user.rower,date__lte=w.date,
date__gte=startdate) date__gte=startdate)
for ww in previousworkouts: for ww in previousworkouts:
delta = (w.date-ww.date).days delta = (w.date-ww.date).days
weight = getattr(ww,metricchoice) weight = getattr(ww,metricchoice)
fatigue += weight*math.exp(-delta/kfatigue) fatigue += weight*math.exp(-delta/kfatigue)
fitness += weight*math.exp(-delta/kfitness) fitness += weight*math.exp(-delta/kfitness)
fatigues.append(fatigue) fatigues.append(fatigue)
fitnesses.append(fitness) fitnesses.append(fitness)
testpower.append(np.nan)
dates.append(datetime.datetime.combine(w.date,datetime.datetime.min.time()))
@@ -1624,6 +1633,11 @@ def fitnessfit_chart(workouts,user,workoutmode='water',startdate=None,
df.sort_values(['date'],inplace=True) df.sort_values(['date'],inplace=True)
df = df.fillna(0)
df = df.groupby(['date']).sum()
df['date'] = df.index.values
#df = df.fillna(0) #df = df.fillna(0)
df['testdup'] = df['testpower'].shift(1) df['testdup'] = df['testpower'].shift(1)