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

Merge branch 'release/v9.64'

Browse Source
This commit is contained in:
Sander Roosendaal
2019-04-02 22:34:23 +02:00
parent 6586581609 0a4d775a9e
commit b8008a7c12
1 changed files with 86 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
rowers/interactiveplots.py
View File

@@ -408,8 +408,13 @@ def interactive_forcecurve(theworkouts,workstrokesonly=True,plottype='scatter'):
# quick linear regression
# peakforce = slope*peakforceangle + intercept
try:
slope, intercept, r,p,stderr = linregress(rowdata['peakforceangle'],rowdata['peakforce'])
except KeyError:
slope = 0
intercept = 0
try:
covariancematrix = np.cov(rowdata['peakforceangle'],y=rowdata['peakforce'])
eig_vals, eig_vecs = np.linalg.eig(covariancematrix)
@@ -457,6 +462,31 @@ def interactive_forcecurve(theworkouts,workstrokesonly=True,plottype='scatter'):
a95b = Rinv[0,1]*y95 + rowdata['peakforceangle'].median()
F95b = Rinv[1,1]*y95 + rowdata['peakforce'].median()
except KeyError:
a25 = 0
F25 = 0
a25b = 0
F25b = 0
a75 = 0
F75 = 0
a75b = 0
F75b = 0
a05 = 0
F05 = 0
a05b = 0
F05b = 0
a95 = 0
F95 = 0
a95b = 0
F95b = 0
@@ -578,8 +608,6 @@ def interactive_forcecurve(theworkouts,workstrokesonly=True,plottype='scatter'):
]
hull2575 = ConvexHull(points2575)
angles2575 = []
forces2575 = []
@@ -711,6 +739,7 @@ def interactive_forcecurve(theworkouts,workstrokesonly=True,plottype='scatter'):
multilinedatax = []
multilinedatay = []
for i in range(len(rowdata)):
try:
x = [
rowdata['catch'].values[i],
rowdata['slip'].values[i]+rowdata['catch'].values[i],
@@ -726,6 +755,9 @@ def interactive_forcecurve(theworkouts,workstrokesonly=True,plottype='scatter'):
rowdata['peakforce'].values[i],
thresholdforce,
0]
except KeyError:
x = [0,0]
y = [0,0]
multilinedatax.append(x)
multilinedatay.append(y)