[chronojump] Testing the use of shorts library

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

commit 8981183c306b2a6081be019b60dfe61e359c106a
Author: Xavier Padullés <testing chronojump org>
Date:   Thu Dec 17 16:51:08 2020 +0100

    Testing the use of shorts library

 r-scripts/sprintPhotocells.R                   | 8 ++++++++
 r-scripts/tests/shortsLibrary/learningShorts.R | 1 -
 2 files changed, 8 insertions(+), 1 deletion(-)
---
diff --git a/r-scripts/sprintPhotocells.R b/r-scripts/sprintPhotocells.R
index af705dcd..2d9d752b 100644
--- a/r-scripts/sprintPhotocells.R
+++ b/r-scripts/sprintPhotocells.R
@@ -89,16 +89,24 @@ getSprintFromPhotocell <- function(positions, splitTimes, noise=0)
                 Vmax = model$Vmax
         } else if (length(positions) == 4){
                 require(shorts)
+<<<<<<< HEAD
                 model <- getModelWithOptimalTimeCorrection(data.frame(
                         distance = positions[2:length(positions)],
                         time= splitTimes[2:length(positions)]))
+=======
+                model <- model_using_splits(positions[2:length(positions)], splitTimes[2:length(positions)])
+>>>>>>> Testing the use of shorts library
                 K = 1/ model$parameters$TAU
                 Vmax = model$parameters$MSS
         } else if (length(positions) == 5){
                 require(shorts)
+<<<<<<< HEAD
                 model <- model_using_splits_with_time_correction(data.frame(
                         distance = positions[2:length(positions)],
                         time= splitTimes[2:length(positions)]))
+=======
+                model <- model_using_splits_with_time_correction(positions[2:length(positions)], 
splitTimes[2:length(positions)])
+>>>>>>> Testing the use of shorts library
                 K = 1/ model$parameters$TAU
                 Vmax = model$parameters$MSS
         }else if (length(positions) >= 6){
diff --git a/r-scripts/tests/shortsLibrary/learningShorts.R b/r-scripts/tests/shortsLibrary/learningShorts.R
index 2c314cd2..51a05958 100644
--- a/r-scripts/tests/shortsLibrary/learningShorts.R
+++ b/r-scripts/tests/shortsLibrary/learningShorts.R
@@ -1,4 +1,3 @@
-
 require(shorts)
 bolt = data.frame(distance = c(10, 20, 30, 40, 50, 60, 70, 80, 90, 100)
                   , time = cumsum(c(1.85, 1.02, 0.91, 0.87, 0.85, 0.82, 0.82, 0.82, 0.83, 0.90)))