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

improving calculate trimp

Browse Source
This commit is contained in:
Sander Roosendaal
2023-05-31 09:29:43 +02:00
parent c8ba755b16
commit 615c059d32
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
rowers/dataprep.py
View File

@@ -1621,7 +1621,13 @@ def get_existing_job(w):
def workout_trimp(w, reset=False):
r = w.user
if w.trimp <= 0 and w.averagehr > 0:
if w.trimp is None:
if get_existing_job(w):
return 0, 0
elif w.averagehr is None:
if get_existing_job(w):
return w.trimp, 0
elif w.trimp <= 0 and w.averagehr > 0:
ftp = float(r.ftp)
_ = myqueue(
queuehigh,
@@ -1675,7 +1681,14 @@ def workout_trimp(w, reset=False):
r.max,
r.rest)
return 0, 0
trimp = 0
averagehr = 0
if w.trimp > 0:
trimp = w.trimp
if w.averagehr > 0:
averagehr = w.averagehr
return trimp, averagehr
def workout_rscore(w, reset=False):