From d850ec430540891d398a83cc8c97833f7f65f3ff Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 6 Jan 2021 08:34:44 +0100 Subject: [PATCH] small play with the algo --- rowers/interactiveplots.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index a843119b..f8910f8f 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -106,7 +106,7 @@ from pandas.core.groupby.groupby import DataError def newtestpower(x): try: - if abs(x['testpower'] - x['testdup']) < 0.2: + if abs(x['testpower'] - x['testdup']) <= 0.2: return np.nan except (AttributeError,TypeError): return np.nan @@ -198,18 +198,19 @@ def build_goldmedalstandards(workouts,kfitness): # fitnesses.append(np.nan) for w in workouts: - ids = [w.id for w in workouts.filter(date__gte=w.date-datetime.timedelta(days=42), + ids = [ww.id for ww in workouts.filter(date__gte=w.date-datetime.timedelta(days=42), date__lte=w.date)] + powerdf = df[df['workout'].isin(ids)] indexmax = powerdf['goldmedalstandard'].idxmax() theid = powerdf.loc[indexmax,'workout'] powertest = powerdf['goldmedalstandard'].max() durationtest = powerdf.loc[indexmax,'goldmedalduration'] - - dates.append(arrow.get(w.date).datetime) + w2 = Workout.objects.get(id=theid) + dates.append(arrow.get(w2.date).datetime) if powertest > 0: testpower.append(powertest) testduration.append(durationtest)