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

added weighted average - rScore now uses weighted average

Browse Source
This commit is contained in:
Sander Roosendaal
2018-02-24 14:23:48 +01:00
parent f4a66a78cf
commit 57eee137ce
4 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rowers/views.py
View File

@@ -754,7 +754,7 @@ from utils import (
geo_distance,serialize_list,deserialize_list,uniqify,
str2bool,range_to_color_hex,absolute,myqueue,get_call,
calculate_age,rankingdistances,rankingdurations,
is_ranking_piece,my_dict_from_instance
is_ranking_piece,my_dict_from_instance,wavg
)
import datautils
@@ -7446,7 +7446,7 @@ def workout_stats_view(request,id=0,message="",successmessage=""):
return HttpResponseRedirect(url)
datadf = dataprep.clean_df_stats(datadf,workstrokesonly=workstrokesonly)
datadf['deltat'] = datadf['time'].diff()
if datadf.empty:
datadf,row = dataprep.getrowdata_db(id=id)
@@ -7472,6 +7472,7 @@ def workout_stats_view(request,id=0,message="",successmessage=""):
for field,verbosename in fielddict.iteritems():
thedict = {
'mean':datadf[field].mean(),
'wmean': wavg(datadf, field, 'deltat'),
'min': datadf[field].min(),
'std': datadf[field].std(),
'max': datadf[field].max(),