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

adding automatic cp calculation for ote

Browse Source
This commit is contained in:
Sander Roosendaal
2020-10-01 08:51:37 +02:00
parent 287d2da73f
commit 52725cb593
2 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rowers/dataprep.py
View File

@@ -96,7 +96,7 @@ queuelow = django_rq.get_queue('low')
queuehigh = django_rq.get_queue('default')
from rowsandall_app.settings import SITE_URL
from rowers.mytypes import otwtypes,otetypes
from rowers.mytypes import otwtypes,otetypes,rowtypes
from rowers import mytypes
from rowers.database import *
@@ -1434,7 +1434,7 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
isbreakthrough = False
ishard = False
if workouttype == 'water':
if workouttype in rowtypes:
df = getsmallrowdata_db(['power', 'workoutid', 'time'], ids=[w.id])
try:
powermean = df['power'].mean()
@@ -1451,14 +1451,18 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
filename = 'media/cpdata_{id}.parquet.gz'.format(id=w.id)
df.to_parquet(filename,engine='fastparquet',compression='GZIP')
res, btvalues, res2 = utils.isbreakthrough(
delta, cpvalues, r.p0, r.p1, r.p2, r.p3, r.cpratio)
if workouttype in otwtypes:
res, btvalues, res2 = utils.isbreakthrough(
delta, cpvalues, r.p0, r.p1, r.p2, r.p3, r.cpratio)
elif workouttype in otetypes:
res, btvalues, res2 = utils.isbreakthrough(
delta, cpvalues, r.ep0, r.ep1, r.ep2, r.ep3, r.ecpratio)
else:
res = 0
res2 = 0
if res:
isbreakthrough = True
res = datautils.updatecp(delta, cpvalues, r)
res = datautils.updatecp(delta, cpvalues, r,workouttype=workouttype)
if res2 and not isbreakthrough:
ishard = True