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

expanded boat types & classes

Browse Source
This commit is contained in:
Sander Roosendaal
2018-06-07 00:50:24 +02:00
parent 657ee8b467
commit 38a201e7e7
9 changed files with 128 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/dataprep.py
View File

@@ -68,7 +68,7 @@ queuelow = django_rq.get_queue('low')
queuehigh = django_rq.get_queue('default')
from rowsandall_app.settings import SITE_URL
from rowers.types import otwtypes
user = settings.DATABASES['default']['USER']
password = settings.DATABASES['default']['PASSWORD']
@@ -2355,7 +2355,7 @@ def workout_rscore(w):
normp = (pwr4mean)**(0.25)
if not np.isnan(normp):
ftp = float(r.ftp)
if w.workouttype in ('water','coastal'):
if w.workouttype in otwtypes:
ftp = ftp*(100.-r.otwslack)/100.
intensityfactor = pwrmean/float(ftp)