[chronojump] improving force calculation on inertial. WIP

[Xavier de Blas <xaviblas src gnome org>]

commit 3239543410e1ca07ffd9dbad0a14908de1b9135b
Author: Xavier de Blas <xaviblas gmail com>
Date:   Wed Jun 24 12:45:51 2015 +0200

    improving force calculation on inertial. WIP

 encoder/util.R |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/encoder/util.R b/encoder/util.R
index 2853e90..0be5891 100644
--- a/encoder/util.R
+++ b/encoder/util.R
@@ -739,11 +739,26 @@ getDynamicsInertial <- function(encoderConfigurationName, displacement, diameter
     angleSpeed = speed * 2 / diameter.m
     angleAccel = accel * 2 / diameter.m
     anglePush = 0 #TODO: send from C#
+    #1.5.1
     force = abs(inertiaMomentum * angleAccel) * (2 / diameter.m) + mass * accel
     power = abs((inertiaMomentum * angleAccel) * angleSpeed) + mass * accel * speed
+    #1.5.2
+    #force = inertiaMomentum * angleAccel * (2 / diameter.m) + mass * accel
+    #power = abs((inertiaMomentum * angleAccel) * angleSpeed) + mass * accel * speed
+    
+    #TODO: WIP    
+    forceDisc = inertiaMomentum * angleAccel * (2 / diameter.m)
+    forceBody = mass * accel
+    print("PRINT FORCE")
+    xmin=9815
+    xmax=11727
+    print(force[xmin:xmax])
+
+    print(max(speed[xmin:xmax]))
+    print(max(accel[xmin:xmax]))
   }
 
-       return(list(displacement=displacement, mass=mass, force=force, power=power))
+       return(list(displacement=displacement, mass=mass, force=force, power=power, forceDisc=forceDisc, 
forceBody=forceBody, accelHere = accel))
 }