[chronojump/optimizeRFD: 2/3] Fixed detection by decrease

[Xavier Padullés <xpadulles src gnome org>]

commit d403eb0a14c6ae9e7ea5c3e5d7f1b5bed92b4472
Author: Xavier Padullés <testing chronojump org>
Date:   Mon Nov 23 16:32:43 2020 +0100

    Fixed detection by decrease

 r-scripts/maximumIsometricForce.R | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/r-scripts/maximumIsometricForce.R b/r-scripts/maximumIsometricForce.R
index 15699ad8..fac0addd 100644
--- a/r-scripts/maximumIsometricForce.R
+++ b/r-scripts/maximumIsometricForce.R
@@ -791,7 +791,7 @@ getMovingAverageForce <- function(test, averageLength = 0.1)
     # print(" movingAverageForce[(lengthSamples %/% 2) +1] :")
     # print( movingAverageForce[(lengthSamples %/% 2) +1])
 
-    print("reconstructed force:")
+    print("reconstructed movingAverageForce:")
     print(movingAverageForce)
     
 }
@@ -866,26 +866,26 @@ getBestFit <- function(originalTest
         print(paste("startSample: ", startSample))
         print(paste("initial endSample: ", endSample))
 
-        # print("movingAverageForce[startSample:endSample]:")
-        # print(movingAverageForce[startSample:endSample])
+        print("movingAverageForce[startSample:endSample]:")
+        print(movingAverageForce[startSample:endSample])
         
         maxMovingAverageForce = max(movingAverageForce[startSample:endSample])
         
-        # print(paste("MaxMovingAverageForce: ", maxMovingAverageForce, "Current Limit: ", 
maxMovingAverageForce*(100 - percentChange) / 100))
-        # print(paste("Current movingAverageForce: ", movingAverageForce[endSample]))
+        print(paste("MaxMovingAverageForce: ", maxMovingAverageForce, "Current Limit: ", 
maxMovingAverageForce*(100 - percentChange) / 100))
+        print(paste("Current movingAverageForce: ", movingAverageForce[endSample], "rawForce: ", 
originalTest$force[endSample]))
         
-        while(originalTest$force[endSample] >= maxMovingAverageForce*(100 - percentChange) / 100 &
+        while(movingAverageForce[endSample] >= maxMovingAverageForce*(100 - percentChange) / 100 &
               endSample < length(originalTest$time))
         {
             if(movingAverageForce[endSample] > maxMovingAverageForce)
             {
                 maxMovingAverageForce = movingAverageForce[endSample]
-                # print(paste("New max:", maxMovingAverageForce))
+                print(paste("New max:", maxMovingAverageForce))
             }
             endSample = endSample + 1
             
-            # print(paste("Current endSample: ", endSample))
-            # print(paste("Current movingAverageForce: ", movingAverageForce[endSample]))
+            print(paste("Current endSample: ", endSample))
+            print(paste("Current movingAverageForce: ", movingAverageForce[endSample]))
         }
     }