otw chart pandas to polars
This commit is contained in:
@@ -996,7 +996,8 @@ def interactive_otwcpchart(powerdf, promember=0, rowername="", r=None,
|
||||
title='', type='water',
|
||||
wcpower=[], wcdurations=[], cpoverlay=False):
|
||||
|
||||
powerdf2 = powerdf[~(powerdf == 0).any(axis=1)].copy()
|
||||
powerdf2 = powerdf.filter(pl.col("Delta") > 0, pl.col("CP") > 0)
|
||||
|
||||
# plot tools
|
||||
if (promember == 1): # pragma: no cover
|
||||
TOOLS = 'save,pan,box_zoom,wheel_zoom,reset,tap,hover,crosshair'
|
||||
@@ -1006,11 +1007,9 @@ def interactive_otwcpchart(powerdf, promember=0, rowername="", r=None,
|
||||
x_axis_type = 'log'
|
||||
|
||||
deltas = powerdf2['Delta'].apply(lambda x: timedeltaconv(x))
|
||||
powerdf2['ftime'] = deltas.apply(lambda x: strfdelta(x))
|
||||
powerdf2['Deltaminutes'] = powerdf2['Delta']/60.
|
||||
|
||||
source = ColumnDataSource(
|
||||
data=powerdf2
|
||||
powerdf2 = powerdf2.with_columns(
|
||||
ftime = deltas.apply(lambda x: strfdelta(x)),
|
||||
Deltaminutes = pl.col("Delta")/60.
|
||||
)
|
||||
|
||||
# there is no Paul's law for OTW
|
||||
@@ -1071,7 +1070,7 @@ def interactive_otwcpchart(powerdf, promember=0, rowername="", r=None,
|
||||
fitpoweraverage = 0*fitpower
|
||||
|
||||
|
||||
fit_data = pd.DataFrame(dict(
|
||||
fit_data = pl.DataFrame(dict(
|
||||
CP=fitpower,
|
||||
CPmax=ratio*fitpower,
|
||||
duration=fitt/60.,
|
||||
@@ -1085,13 +1084,12 @@ def interactive_otwcpchart(powerdf, promember=0, rowername="", r=None,
|
||||
# url = urls,
|
||||
))
|
||||
|
||||
|
||||
if not title:
|
||||
title = "Critical Power for "+rowername
|
||||
|
||||
chart_dict = {
|
||||
'data': powerdf2.to_dict("records"),
|
||||
'fitdata': fit_data.to_dict("records"),
|
||||
'data': powerdf2.to_dicts(),
|
||||
'fitdata': fit_data.to_dicts(),
|
||||
'title': title,
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user