From bd7b0032802bc8b997e8d7971004a1f9d2c2e4fb Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sat, 10 Jun 2017 21:19:00 -0400 Subject: [PATCH] reduced calculational complexity otwcp --- rowers/views.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/rowers/views.py b/rowers/views.py index 87fdf6f0..1d9bf9c5 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -2905,7 +2905,7 @@ def otwrankings_view(request,theuser=0, maxlog10 = np.log10(maxt) - logarr = np.arange(100)*maxlog10/100. + logarr = np.arange(50)*maxlog10/50. logarr = [int(10.**(la)) for la in logarr] logarr = pd.Series(logarr) logarr.drop_duplicates(keep='first',inplace=True) @@ -2923,6 +2923,18 @@ def otwrankings_view(request,theuser=0, tt = group['time'].copy() ww = group['power'].copy() + tmax = tt.max() + newlen = int(tmax/2000.) + print newlen,len(ww) + newt = np.arange(newlen)*tmax/float(newlen) + neww = griddata(tt.values, + ww.values, + newt,method='linear', + rescale=True) + + #tt = pd.Series(newt) + #ww = pd.Series(neww) + try: avgpower[id] = int(ww.mean()) except ValueError: