[chronojump] Safest from position to displacement (without a 0 at start of displacement)
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Safest from position to displacement (without a 0 at start of displacement)
- Date: Mon, 18 May 2015 19:07:42 +0000 (UTC)
commit a71a32ff5a2126833e89ab4681c0177fd1d2802d
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon May 18 21:02:45 2015 +0200
Safest from position to displacement (without a 0 at start of displacement)
encoder/util.R | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/encoder/util.R b/encoder/util.R
index 2ceb127..9dade04 100644
--- a/encoder/util.R
+++ b/encoder/util.R
@@ -485,6 +485,7 @@ findECPhases <- function(displacement,speed) {
#print("speed.ext-Cross")
#print(speed.ext$cross[,1])
#print("search min cross: crossMinRow")
+
crossMinRow=which(speed.ext$cross[,1] > searchMinSpeedEnd & speed.ext$cross[,1] < searchMaxSpeedIni)
#print(crossMinRow)
@@ -797,7 +798,7 @@ getDisplacementInertial <- function(displacement, encoderConfigurationName, diam
position = angle * diameterMeters / 2
position = position * 1000 #m -> mm
#this is to make "inverted cumsum"
- displacement = c(0,diff(position)) #this displacement is going to be used now
+ displacement = c(position[1],diff(position)) #this displacement is going to be used now
} else if(encoderConfigurationName == "ROTARYFRICTIONSIDEINERTIAL" ||
encoderConfigurationName == "ROTARYFRICTIONSIDEINERTIALLATERAL"){
displacement = displacement * diameter / diameterExt #displacement of the axis
@@ -814,7 +815,7 @@ getDisplacementInertial <- function(displacement, encoderConfigurationName, diam
position = angle * diameterMeters / 2
position = position * 500 #m -> mm and the rope moves twice as the body
#this is to make "inverted cumsum"
- displacement = c(0,diff(position)) #this displacement is going to be used now
+ displacement = c(position[1],diff(position)) #this displacement is going to be used now
}
@@ -876,7 +877,7 @@ getDisplacementInertialBody <- function(positionStart, displacement, draw, title
#don't use it
#displacementPerson = c(positionStart,diff(positionPerson))
#better have it starting with 0 and then speed calculations... will be correct
- displacementPerson = c(0,diff(positionPerson))
+ displacementPerson = c(positionPerson[1],diff(positionPerson))
#write(displacementPerson,stderr())
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]