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

better time sum in pie chart

Browse Source
This commit is contained in:
Sander Roosendaal
2020-05-06 13:18:06 +02:00
parent 42ae036488
commit bf5f76e2ea
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rowers/interactiveplots.py
View File

@@ -176,20 +176,24 @@ def interactive_hr_piechart(df,rower,title):
return "","Not enough data to make a chart" return "","Not enough data to make a chart"
df.sort_values(by='hr',inplace=True) df.sort_values(by='hr',inplace=True)
df['timehr'] = df['deltat']*df['hr']
sumtimehr = df['deltat'].sum()
qry = 'hr < {ut2}'.format(ut2=rower.ut2) qry = 'hr < {ut2}'.format(ut2=rower.ut2)
frac_lut2 = len(df.query(qry))/len(df) frac_lut2 = df.query(qry)['deltat'].sum()/sumtimehr
qry = 'hr < {ut1}'.format(ut1=rower.ut1,ut2=rower.ut2) qry = 'hr < {ut1}'.format(ut1=rower.ut1,ut2=rower.ut2)
frac_ut2 = len(df.query(qry))/len(df) frac_ut2 = df.query(qry)['deltat'].sum()/sumtimehr
qry = 'hr < {at}'.format(ut1=rower.ut1,at=rower.at) qry = 'hr < {at}'.format(ut1=rower.ut1,at=rower.at)
frac_ut1 = len(df.query(qry))/len(df) frac_ut1 = df.query(qry)['deltat'].sum()/sumtimehr
qry = 'hr < {tr}'.format(at=rower.at,tr=rower.tr) qry = 'hr < {tr}'.format(at=rower.at,tr=rower.tr)
frac_at = len(df.query(qry))/len(df) frac_at = df.query(qry)['deltat'].sum()/sumtimehr
qry = 'hr < {an}'.format(tr=rower.tr,an=rower.an) qry = 'hr < {an}'.format(tr=rower.tr,an=rower.an)
frac_tr = len(df.query(qry))/len(df) frac_tr = df.query(qry)['deltat'].sum()/sumtimehr
frac_an = 1. frac_an = 1.