Private
Public Access
1
0

some changes for Mike

This commit is contained in:
Sander Roosendaal
2020-10-21 21:16:49 +02:00
parent 4b1f3d50f2
commit 6069e2c810
2 changed files with 6 additions and 2 deletions

View File

@@ -2913,9 +2913,10 @@ def interactive_otwcpchart(powerdf,promember=0,rowername="",r=None,cpfit='data',
if type == 'water':
p1 = [r.p0,r.p1,r.p2,r.p3]
ratio = r.cpratio
else:
elif type == 'erg' :
p1 = [r.ep0,r.ep1,r.ep2,r.ep3]
ratio = r.ecpratio
fitfunc = lambda pars,x: abs(pars[0])/(1+(x/abs(pars[2]))) + abs(pars[1])/(1+(x/abs(pars[3])))
fitpower = fitfunc(p1,fitt)

View File

@@ -528,7 +528,7 @@ def cpdata(workouts, options):
'CP':cpvalue,
'workout':workoutnames,
})
if powerdf.empty:
@@ -552,6 +552,9 @@ def cpdata(workouts, options):
wtype = 'water'
if workouts[0].workouttype in mytypes.otetypes:
wtype = 'erg'
if workouts[0].workouttype == 'bikerg':
# for Mike
wtype = 'erg'
res = interactive_otwcpchart(powerdf,promember=True,rowername=rowername,r=r,
cpfit=cpfit,title=title,type=wtype)
script = res[0]