[chronojump] Temporary fixed problems on ecPhases find in propulsive
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Temporary fixed problems on ecPhases find in propulsive
- Date: Thu, 29 May 2014 19:38:59 +0000 (UTC)
commit 5b05f2ee86edddeb6f72431da3fc8168766f6d21
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu May 29 21:38:32 2014 +0200
Temporary fixed problems on ecPhases find in propulsive
encoder/graph.R | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
---
diff --git a/encoder/graph.R b/encoder/graph.R
index 167e6d1..e63adbc 100644
--- a/encoder/graph.R
+++ b/encoder/graph.R
@@ -513,7 +513,15 @@ findECPhases <- function(displacement,speed) {
eccentric = 0
isometric = 0
concentric = 0
-
+
+ #temporary fix problem of found MinSpeedEnd at right
+ if(searchMinSpeedEnd > searchMaxSpeedIni)
+ return(list(
+ eccentric=0,
+ isometric=0,
+ concentric=0))
+
+
isometricUse = TRUE
if(isometricUse) {
eccentric=1:min(speed.ext$cross[crossMinRow,1])
@@ -609,12 +617,17 @@ print(c(" smoothing:",smoothing))
eccentric = phases$eccentric
isometric = phases$isometric
concentric = phases$concentric
-
- maxSpeedT <- min(which(speed$y == max(speed$y)))
- maxSpeedTInConcentric = maxSpeedT - (length(eccentric) + length(isometric))
-
- propulsiveEnd = length(eccentric) + length(isometric) +
findPropulsiveEnd(accel$y,concentric,maxSpeedTInConcentric)
- #print(c("lengths: ", length(eccentric), length(isometric),
findPropulsiveEnd(accel$y,concentric), propulsiveEnd))
+
+ #temporary fix problem of found MinSpeedEnd at right
+ if(eccentric == 0 && isometric == 0 && concentric == 0)
+ propulsiveEnd = length(displacement)
+ else {
+ maxSpeedT <- min(which(speed$y == max(speed$y)))
+ maxSpeedTInConcentric = maxSpeedT - (length(eccentric) + length(isometric))
+
+ propulsiveEnd = length(eccentric) + length(isometric) +
findPropulsiveEnd(accel$y,concentric,maxSpeedTInConcentric)
+ #print(c("lengths: ", length(eccentric), length(isometric),
findPropulsiveEnd(accel$y,concentric), propulsiveEnd))
+ }
} else if(eccon=="e") {
#not eccon="e" because not propulsive calculations on eccentric
} else { #ecS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]