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

debugging

Browse Source
This commit is contained in:
Sander Roosendaal
2017-06-08 08:34:35 -07:00
parent db651b8e5a
commit 8a9576c55a
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/interactiveplots.py
View File

@@ -671,7 +671,7 @@ def interactive_otwcpchart(powerdf,promember=0):
y_range_name = "watermark", y_range_name = "watermark",
) )
plot.circle('Delta','CP',source=source,fill_color='red',size=15, plot.line('Delta','CP',source=source,color='red',line_width=5,
legend='Power Data') legend='Power Data')
plot.xaxis.axis_label = "Duration (seconds)" plot.xaxis.axis_label = "Duration (seconds)"
plot.yaxis.axis_label = "Power (W)" plot.yaxis.axis_label = "Power (W)"

24
rowers/views.py
View File

@@ -2897,18 +2897,23 @@ def otwrankings_view(request,theuser=0,
thesecs.append(timesecs) thesecs.append(timesecs)
if len(thesecs) != 0: if len(thesecs) != 0:
maxt = pd.Series(thesecs).max() maxt = 2*pd.Series(thesecs).max()
else: else:
maxt = 1000. maxt = 1000.
maxlog10 = np.log10(maxt) maxlog10 = np.log10(maxt)
logarr = np.arange(100)*maxlog10/100. logarr = np.arange(500)*maxlog10/500.
logarr = [int(10.**(la)) for la in logarr] logarr = [int(10.**(la)) for la in logarr]
logarr = pd.Series(logarr) logarr = pd.Series(logarr)
logarr.drop_duplicates(keep='first',inplace=True) logarr.drop_duplicates(keep='first',inplace=True)
logarr = logarr.values logarr = logarr.values
delta = [] delta = []
cpvalue = [] cpvalue = []
avgpower = {} avgpower = {}
@@ -2934,32 +2939,35 @@ def otwrankings_view(request,theuser=0,
t_1 = tt.ix[indexmax-i-2] t_1 = tt.ix[indexmax-i-2]
deltat = 1.0e-3*(t_0-t_1) deltat = 1.0e-3*(t_0-t_1)
wmax = w_roll.ix[indexmax] wmax = w_roll.ix[indexmax]
dt.append(deltat) if not np.isnan(deltat) and not np.isnan(wmax):
cpw.append(wmax) dt.append(deltat)
cpw.append(wmax)
except KeyError: except KeyError:
pass pass
dt = pd.Series(dt) dt = pd.Series(dt)
cpw = pd.Series(cpw) cpw = pd.Series(cpw)
cpvalues = griddata(dt.values, cpvalues = griddata(dt.values,
cpw.values, cpw.values,
logarr,method='linear',fill_value=0) logarr,method='linear',
rescale=True)
for cpv in cpvalues: for cpv in cpvalues:
cpvalue.append(cpv) cpvalue.append(cpv)
for d in logarr: for d in logarr:
delta.append(d) delta.append(d)
print avgpower delta = pd.Series(delta,name='Delta')
dt = pd.Series(delta,name='Delta')
cpvalue = pd.Series(cpvalue,name='CP') cpvalue = pd.Series(cpvalue,name='CP')
powerdf = pd.DataFrame({ powerdf = pd.DataFrame({
'Delta':delta, 'Delta':delta,
'CP':cpvalue, 'CP':cpvalue,
}) })
powerdf = powerdf[powerdf['CP']>0] powerdf = powerdf[powerdf['CP']>0]
powerdf.dropna(axis=0,inplace=True) powerdf.dropna(axis=0,inplace=True)
powerdf.sort_values(['Delta','CP'],ascending=[1,0],inplace=True) powerdf.sort_values(['Delta','CP'],ascending=[1,0],inplace=True)