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

working predictions and fit type

Browse Source
This commit is contained in:
Sander Roosendaal
2020-10-14 21:24:37 +02:00
parent c067a33372
commit 849d9cdaf3
5 changed files with 126 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rowers/interactiveplots.py
View File

@@ -2881,7 +2881,7 @@ def interactive_agegroupcpchart(age,normalized=False):
return script,div
def interactive_otwcpchart(powerdf,promember=0,rowername=""):
def interactive_otwcpchart(powerdf,promember=0,rowername="",r=None,cpfit='data'):
powerdf = powerdf[~(powerdf == 0).any(axis=1)]
# plot tools
if (promember==1):
@@ -2906,7 +2906,13 @@ def interactive_otwcpchart(powerdf,promember=0,rowername=""):
thesecs = powerdf['Delta']
theavpower = powerdf['CP']
p1,fitt,fitpower,ratio = datautils.cpfit(powerdf)
if cpfit == 'automatic' and r is not None:
p1 = [r.p0,r.p1,r.p2,r.p3]
ratio = r.cpratio
fitfunc = lambda pars,x: abs(pars[0])/(1+(x/abs(pars[2]))) + abs(pars[1])/(1+(x/abs(pars[3])))
fitpower = fitfunc(p1,fitt)
message = ""
#if len(fitpower[fitpower<0]) > 0: