added stayer score based on 6 min
This commit is contained in:
@@ -1481,19 +1481,28 @@ def interactive_cpchart(rower,thedistances,thesecs,theavpower,
|
||||
|
||||
# Get stayer score
|
||||
if success == 1:
|
||||
power1min = fitfunc(p1,60.)
|
||||
power4min = fitfunc(p1,240.)
|
||||
power6min = fitfunc(p1,360.)
|
||||
power30min = fitfunc(p1,1800.)
|
||||
power1h = fitfunc(p1,3600.)
|
||||
power10sec = fitfunc(p1,10.)
|
||||
r10sec4min = 100.*power10sec/power4min
|
||||
r1h4min = 100.*power1h/power4min
|
||||
r1min6min = 100.*power1min/power6min
|
||||
r30min6min = 100.*power30min/power6min
|
||||
|
||||
combined = r1h4min-0.2*(r10sec4min-100)
|
||||
combined2 = r30min6min-1.5*(r1min6min-100)
|
||||
|
||||
dataset = pd.read_csv('static/stats/combined_set.csv')
|
||||
dataset2 = pd.read_csv('static/stats/combined_set6min.csv')
|
||||
|
||||
stayerscore = int(percentileofscore(dataset['combined'],combined))
|
||||
stayerscore2 = int(percentileofscore(dataset2['combined'],combined2))
|
||||
else:
|
||||
stayerscore = None
|
||||
stayerscore2 = None
|
||||
|
||||
|
||||
fitt = pd.Series(10**(4*np.arange(100)/100.))
|
||||
@@ -1576,6 +1585,13 @@ def interactive_cpchart(rower,thedistances,thesecs,theavpower,
|
||||
background_fill_color='white',
|
||||
text_color='black')
|
||||
)
|
||||
plot.add_layout(
|
||||
Label(x=100,y=120,x_units='screen',y_units='screen',
|
||||
text='Stayer Score (6min) '+str(stayerscore2)+'%',
|
||||
background_fill_alpha=0.7,
|
||||
background_fill_color='white',
|
||||
text_color='black')
|
||||
)
|
||||
|
||||
cpdata = dataprep.fetchcperg(rower, theworkouts)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user