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

fixed bug in piece duration (CP chart)

Browse Source
This commit is contained in:
Sander Roosendaal
2020-11-02 21:20:05 +01:00
parent 5348a5d9d3
commit d542c6a573
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rowers/views/analysisviews.py
View File

@@ -555,7 +555,7 @@ def cpdata(workouts, options):
if workouts[0].workouttype == 'bikeerg': if workouts[0].workouttype == 'bikeerg':
# for Mike # for Mike
wtype = 'erg' wtype = 'erg'
res = interactive_otwcpchart(powerdf,promember=True,rowername=rowername,r=r, res = interactive_otwcpchart(powerdf,promember=True,rowername=rowername,r=r,
cpfit=cpfit,title=title,type=wtype) cpfit=cpfit,title=title,type=wtype)
script = res[0] script = res[0]
@@ -585,10 +585,14 @@ def cpdata(workouts, options):
minutes = options['piece'] minutes = options['piece']
if minutes != 0: if minutes != 0:
# minutes = 77
hourvalue,tvalue = divmod(minutes,60) hourvalue,tvalue = divmod(minutes,60)
# hourvalue = 1, tvalue = 17
hourvalue = int(hourvalue) hourvalue = int(hourvalue)
minutevalue = int(tvalue) minutevalue = int(tvalue)
tvalue = int(60*(tvalue-minutevalue)) tvalue = int(60*(tvalue-minutevalue))
if hourvalue >= 24: if hourvalue >= 24:
hourvalue = 23 hourvalue = 23
pieceduration = datetime.time( pieceduration = datetime.time(
@@ -596,7 +600,8 @@ def cpdata(workouts, options):
hour = hourvalue, hour = hourvalue,
second = tvalue, second = tvalue,
) )
pieceseconds = 2600.*pieceduration.hour+60.*pieceduration.minute+pieceduration.second
pieceseconds = 3600.*pieceduration.hour+60.*pieceduration.minute+pieceduration.second
# CP model # CP model
pwr = p1[0]/(1+pieceseconds/p1[2]) pwr = p1[0]/(1+pieceseconds/p1[2])
pwr += p1[1]/(1+pieceseconds/p1[3]) pwr += p1[1]/(1+pieceseconds/p1[3])