From 7cc59cb71a45b929a8db4009e4aae615a7cd2e60 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 10 Oct 2017 14:48:07 +0200 Subject: [PATCH] refined hard --- rowers/dataprep.py | 7 +++++-- rowers/utils.py | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 6d784d73..abfde140 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -38,7 +38,10 @@ import pandas as pd import numpy as np import itertools import math -from tasks import handle_sendemail_unrecognized,handle_sendemail_breakthrough +from tasks import ( + handle_sendemail_unrecognized,handle_sendemail_breakthrough, + handle_sendemail_hard + ) from django.conf import settings from sqlalchemy import create_engine @@ -672,7 +675,7 @@ def save_workout_database(f2,r,dosmooth=True,workouttype='rower', if res: isbreakthrough = True res = datautils.updatecp(delta,cpvalues,r) - if res2: + if res2 and not isbreakthrough: ishard = True # submit email task to send email about breakthrough workout diff --git a/rowers/utils.py b/rowers/utils.py index 209d06e3..d0b1732a 100644 --- a/rowers/utils.py +++ b/rowers/utils.py @@ -151,6 +151,7 @@ def isbreakthrough(delta,cpvalues,p0,p1,p2,p3,ratio): res = np.sum(cpvalues>pwr) res2 = np.sum(cpvalues>pwr2) + btdf = pd.DataFrame( { 'delta':delta[cpvalues>pwr],