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

improving correlation matrix

Browse Source
This commit is contained in:
Sander Roosendaal
2019-10-04 09:24:10 +02:00
parent 0656ed3a26
commit 65db7ee6d8
4 changed files with 62 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
rowers/views/analysisviews.py
View File

@@ -523,8 +523,8 @@ def statsdata(workouts, options):
# Create stats
stats = {}
fielddict.pop('workoutstate')
fielddict.pop('workoutid')
# fielddict.pop('workoutstate')
# fielddict.pop('workoutid')
for field,verbosename in fielddict.items():
@@ -544,15 +544,15 @@ def statsdata(workouts, options):
cor = datadf.corr(method='spearman')
cor.fillna(value=0,inplace=True)
cordict = {}
for field1,verbosename in fielddict.items():
for field1,verbosename1 in fielddict.items():
thedict = {}
for field2,verbosename in fielddict.items():
for field2,verbosename2 in fielddict.items():
try:
thedict[field2] = cor.loc[field1,field2]
thedict[verbosename2] = cor.loc[field1,field2]
except KeyError:
thedict[field2] = 0
thedict[verbosename2] = 0
cordict[field1] = thedict
cordict[verbosename1] = thedict
context = {
'stats':stats,
@@ -4208,8 +4208,10 @@ def cumstats(request,theuser=0,
# Create stats
stats = {}
fielddict.pop('workoutstate')
fielddict.pop('workoutid')
try:
fielddict.pop('pace')
except KeyError:
pass
for field,verbosename in fielddict.items():
thedict = {
@@ -4228,15 +4230,15 @@ def cumstats(request,theuser=0,
cor = datadf.corr(method='spearman')
cor.fillna(value=0,inplace=True)
cordict = {}
for field1,verbosename in fielddict.items():
for field1,verbosename1 in fielddict.items():
thedict = {}
for field2,verbosename in fielddict.items():
for field2,verbosename2 in fielddict.items():
try:
thedict[field2] = cor.loc[field1,field2]
thedict[verbosename2] = cor.loc[field1,field2]
except KeyError:
thedict[field2] = 0
thedict[verbosename2] = 0
cordict[field1] = thedict
cordict[verbosename1] = thedict
# set options form correctly
initial = {}

20
rowers/views/workoutviews.py
View File

@@ -2537,9 +2537,13 @@ def workout_stats_view(request,id=0,message="",successmessage=""):
stats = {}
fieldlist,fielddict = dataprep.getstatsfields()
fielddict.pop('workoutstate')
fielddict.pop('workoutid')
# fielddict.pop('workoutstate')
# fielddict.pop('workoutid')
try:
fielddict.pop('pace')
except KeyError:
pass
for field,verbosename in fielddict.items():
thedict = {
'mean':datadf[field].mean(),
@@ -2558,15 +2562,15 @@ def workout_stats_view(request,id=0,message="",successmessage=""):
cor = datadf.corr(method='spearman')
cor.fillna(value=0,inplace=True)
cordict = {}
for field1,verbosename in fielddict.items():
for field1,verbosename1 in fielddict.items():
thedict = {}
for field2,verbosename in fielddict.items():
for field2,verbosename2 in fielddict.items():
try:
thedict[field2] = cor.loc[field1,field2]
thedict[verbosename2] = cor.loc[field1,field2]
except KeyError:
thedict[field2] = 0
thedict[verbosename2] = 0
cordict[field1] = thedict
cordict[verbosename1] = thedict
# additional non-automated stats
otherstats = {}