[chronojump] util.R has calculateMassEquivalent() as a separate function



commit 34745afa419f3ad8afa677825229426880ccccd9
Author: Xavier de Blas <xaviblas gmail com>
Date:   Mon Nov 16 17:09:32 2020 +0100

    util.R has calculateMassEquivalent() as a separate function

 encoder/util.R | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/encoder/util.R b/encoder/util.R
index 9477d789..649fa215 100644
--- a/encoder/util.R
+++ b/encoder/util.R
@@ -824,11 +824,6 @@ pafGenerate <- function(eccon, kinematics, massBody, massExtra, laterality, iner
        mass = kinematics$mass
        #names will be used on graph.R writeCurves
 
-       #massEq calculation
-       massEq <- 0
-       if(inertiaMomentum > 0 && gearedDown > 0 && diameter > 0)
-               massEq <- 10000 * inertiaMomentum * 1/gearedDown / 4 / (diameter^2)
-
        return(data.frame(
                          meanSpeed, maxSpeed, maxSpeedT,
                          meanPower, peakPower, peakPowerT, pp_ppt,
@@ -836,10 +831,18 @@ pafGenerate <- function(eccon, kinematics, massBody, massExtra, laterality, iner
                          mass, massBody, massExtra,            #kinematics$mass is Load
                          workJ, impulse,
                          laterality, inertiaMomentum, diameter,
-                         massEq
+                         calculateMassEquivalent(inertiaMomentum, gearedDown, diameter)
                          ))
 }
 
+calculateMassEquivalent <- function(inertiaMomentum, gearedDown, diameter)
+{
+       if(inertiaMomentum > 0 && gearedDown > 0 && diameter > 0)
+               return (10000 * inertiaMomentum * 1/gearedDown / 4 / (diameter^2))
+       else
+               return (0)
+}
+
 isInertial <- function(encoderConfigurationName) {
        if(encoderConfigurationName == "LINEARINERTIAL" ||
           encoderConfigurationName == "ROTARYFRICTIONSIDEINERTIAL" ||


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]