[chronojump] Improvements on neuromuscular
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Improvements on neuromuscular
- Date: Tue, 25 Mar 2014 13:07:00 +0000 (UTC)
commit a4486adf435a04ae97d91548d867be86818d431b
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Mar 25 14:06:17 2014 +0100
Improvements on neuromuscular
encoder/graph.R | 8 ++------
encoder/neuromuscularProfile.R | 40 ++++++++++++++++++++++------------------
src/encoder.cs | 4 ++--
src/gui/encoderTreeviews.cs | 9 +++++++++
4 files changed, 35 insertions(+), 26 deletions(-)
---
diff --git a/encoder/graph.R b/encoder/graph.R
index e29284c..26a9429 100644
--- a/encoder/graph.R
+++ b/encoder/graph.R
@@ -2640,7 +2640,7 @@ doProcess <- function(options) {
if(n < 24) {
plot(0,0,type="n",axes=F,xlab="",ylab="")
- text(x=0,y=0,"Not enough data.",cex=1.5)
+ text(x=0,y=0,"Not enough data.\nNeed 6 jumps and 4 phases for each jump
(ecc,con,ecc,con).",cex=1.5)
dev.off()
write("", OutputData1)
quit()
@@ -2670,11 +2670,7 @@ doProcess <- function(options) {
par(mar=c(4,4,1,4))
neuromuscularProfilePlotOther(
displacement, #curves,
- list(npj[[1]]$numJump, npj[[2]]$numJump,
npj[[3]]$numJump),
- list(npj[[1]]$start.e1, npj[[2]]$start.e1,
npj[[3]]$start.e1),
- list(npj[[1]]$end.e2, npj[[2]]$end.e2,
npj[[3]]$end.e2),
- list(npj[[1]]$start.c, npj[[2]]$start.c,
npj[[3]]$start.c),
- list(npj[[1]]$end.c, npj[[2]]$end.c,
npj[[3]]$end.c),
+ list(npj[[1]]$l.context, npj[[2]]$l.context,
npj[[3]]$l.context),
(MassBody + MassExtra), SmoothingOneC)
#TODO: calcular un SmothingOneECE i passar-lo a PlotOther enlloc del SmoothingOneC
par(mfrow=c(1,1))
diff --git a/encoder/neuromuscularProfile.R b/encoder/neuromuscularProfile.R
index 20dc0c5..7308d52 100644
--- a/encoder/neuromuscularProfile.R
+++ b/encoder/neuromuscularProfile.R
@@ -24,9 +24,7 @@ g = 9.81
#comes with every jump of the three best (in flight time)
#e1, c, e2 are displacements
-neuromuscularProfileJump <- function(
- numJump, start.e1, end.e2, start.c, end.c, #these are not used in this
function but are returned as list
- e1, c, e2, mass, smoothingC)
+neuromuscularProfileJump <- function(l.context, e1, c, e2, mass, smoothingC)
{
# /\
# / \
@@ -203,10 +201,7 @@ print(c("mean clforce",mean(cl.force)))
e2f.rfd.max = e2f.rfd.max
)
- return (list(numJump = numJump,
- start.e1 = start.e1, end.e2 = end.e2,
- start.c = start.c, end.c = end.c,
- e1 = e1.list, c = c.list, e2 = e2.list))
+ return (list(l.context = l.context, e1 = e1.list, c = c.list, e2 = e2.list))
}
#Manuel Lapuente analysis of 6 separate ABKs (e1, c, e2)
@@ -252,12 +247,15 @@ neuromuscularProfileGetData <- function(displacement, curves, mass, smoothingC)
count = 1
for(i in df$nums[bests]) {
numJump <- ((i-2)/4)+1 #this gets the concentric phase num and calculates which jump is
+ l.context <- list(numJump = numJump,
+ jumpHeight = heights[numJump],
+ start.e1 = curves[(i-1),1], #start of all (start of e1)
+ end.e2 = curves[(i+1),2], #end of all (end of e2)
+ start.c = curves[i,1], #start of c
+ end.c = curves[i,2] #end of c
+ )
npj[[count]] <- neuromuscularProfileJump(
- numJump,
- curves[(i-1),1], #start of all (start of e1)
- curves[(i+1),2], #end of all (end of e2)
- curves[i,1], #start of c
- curves[i,2], #end of c
+ l.context,
displacement[curves[(i-1),1]:curves[(i-1),2]], #e1
displacement[curves[(i),1]:curves[(i),2]], #c
displacement[curves[(i+1),1]:curves[(i+1),2]], #e2
@@ -333,7 +331,7 @@ neuromuscularProfilePlotBars <- function(title, load, explode, drive)
#show small text related to graph result and how to train
}
-neuromuscularProfilePlotOther <- function(displacement, l.numJump, l.start.e1, l.end.e2, l.start.c, l.end.c,
mass, smoothingC)
+neuromuscularProfilePlotOther <- function(displacement, l.context, mass, smoothingC)
{
#plot
#curve e1,c,e2 distance,speed,force /time of best jump
@@ -349,7 +347,7 @@ neuromuscularProfilePlotOther <- function(displacement, l.numJump, l.start.e1, l
l.force.max.c.pos = NULL
for(i in 1:3) {
- d = displacement[as.integer(l.start.e1[i]):as.integer(l.end.e2[i])]
+ d = displacement[as.integer(l.context[[i]]$start.e1):as.integer(l.context[[i]]$end.e2)]
speed <- getSpeed(d, smoothingC)
accel = getAcceleration(speed)
@@ -374,8 +372,8 @@ neuromuscularProfilePlotOther <- function(displacement, l.numJump, l.start.e1, l
#find the max force moment in concentric
#first know start.c relative to this jump
- start.c = as.integer(l.start.c[i]) - as.integer(l.start.e1[i])
- end.c = as.integer(l.end.c[i]) - as.integer(l.start.e1[i])
+ start.c = as.integer(l.context[[i]]$start.c) - as.integer(l.context[[i]]$start.e1)
+ end.c = as.integer(l.context[[i]]$end.c) - as.integer(l.context[[i]]$start.e1)
#get the max force position between start.c and end.c
l.force.max.c.pos[i] = min(which(force[start.c:end.c] == max(force[start.c:end.c])))
@@ -400,8 +398,10 @@ neuromuscularProfilePlotOther <- function(displacement, l.numJump, l.start.e1, l
lines(forceSecond, col=cols[2])
lines(forceThird, col=cols[3])
abline(v=max(l.force.max.c.pos),lty=2)
- legend("topleft", col=cols, lty=1,
- legend=c(paste("Jump", l.numJump[1]), paste("Jump", l.numJump[2]), paste("Jump", l.numJump[3]))
+ legend("topleft", col=cols, lty=1, cex=.9,
+ legend=c(paste("Jump ", l.context[[1]]$numJump, " (", l.context[[1]]$jumpHeight, "
cm)",sep=""),
+ paste("Jump ", l.context[[2]]$numJump, " (", l.context[[2]]$jumpHeight, "
cm)",sep=""),
+ paste("Jump ", l.context[[3]]$numJump, " (", l.context[[3]]$jumpHeight, "
cm)",sep=""))
)
}
@@ -414,6 +414,10 @@ neuromuscularProfileWriteData <- function(npj, outputData1)
df <- data.frame(rbind(jump1,jump2,jump3))
colnames(df) <- c(paste("e1.",names(npj[[1]]$e1),sep=""), names(npj[[1]]$c), names(npj[[1]]$e2))
+ rownames(df) <- c(
+ paste("jump",npj[[1]]$l.context$numJump),
+ paste("jump",npj[[2]]$l.context$numJump),
+ paste("jump",npj[[3]]$l.context$numJump))
print(df)
write.csv(df, outputData1, quote=FALSE)
diff --git a/src/encoder.cs b/src/encoder.cs
index 9d77f3d..1bc81ea 100644
--- a/src/encoder.cs
+++ b/src/encoder.cs
@@ -273,7 +273,7 @@ public class EncoderCurve
//used on TreeView
public class EncoderNeuromuscularData
{
- public string n; //?
+ public string n;
public int e1_range;
public int e1_t;
public double e1_fmax;
@@ -304,7 +304,7 @@ public class EncoderNeuromuscularData
//used on TreeView analyze
public EncoderNeuromuscularData (
- string n, //?
+ string n,
int e1_range, int e1_t, double e1_fmax, double e1_rfd_avg, double e1_i,
int ca_range, int cl_t, double cl_rfd_avg, double cl_i,
double cl_f_avg, double cl_vf, double cl_f_max,
diff --git a/src/gui/encoderTreeviews.cs b/src/gui/encoderTreeviews.cs
index 094bdd8..2496a4d 100644
--- a/src/gui/encoderTreeviews.cs
+++ b/src/gui/encoderTreeviews.cs
@@ -373,6 +373,9 @@ public partial class ChronoJumpWindow
//crt1.Background = "blue";
switch(i){
+ case 0:
+ aColumn.SetCellDataFunc (aCell, new Gtk.TreeCellDataFunc
(Render_jump_num));
+ break;
case 1:
aColumn.SetCellDataFunc (aCell, new Gtk.TreeCellDataFunc
(Render_e1_range));
break;
@@ -686,6 +689,12 @@ public partial class ChronoJumpWindow
/* start rendering neuromuscular cols */
+ private void Render_jump_num (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.TreeModel model,
Gtk.TreeIter iter)
+ {
+ EncoderNeuromuscularData nm = (EncoderNeuromuscularData) model.GetValue (iter, 0);
+ (cell as Gtk.CellRendererText).Text = nm.n.ToString();
+ }
+
private void Render_e1_range (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.TreeModel model,
Gtk.TreeIter iter)
{
EncoderNeuromuscularData nm = (EncoderNeuromuscularData) model.GetValue (iter, 0);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
