[chronojump] Using shorts library for better calculations

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

commit ddbe55069ccb3d0b1fa2f1fe6e305b87e959ad85
Author: Xavier Padullés <testing chronojump org>
Date:   Thu Dec 17 20:31:25 2020 +0100

    Using shorts library for better calculations

 r-scripts/sprintPhotocells.R                   | 9 +--------
 r-scripts/tests/shortsLibrary/learningShorts.R | 1 -
 2 files changed, 1 insertion(+), 9 deletions(-)
---
diff --git a/r-scripts/sprintPhotocells.R b/r-scripts/sprintPhotocells.R
index 2d9d752b..c634e35a 100644
--- a/r-scripts/sprintPhotocells.R
+++ b/r-scripts/sprintPhotocells.R
@@ -89,24 +89,17 @@ 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 51a05958..280d19c4 100644
--- a/r-scripts/tests/shortsLibrary/learningShorts.R
+++ b/r-scripts/tests/shortsLibrary/learningShorts.R
@@ -10,7 +10,6 @@ split_times3 <- data.frame(
     time = c(1.614, 2.821, 3.966)
 )
 
-
 # get the model adjusting the time_correction to the best fit
 getModelWithOptimalTimeCorrection <- function(split_times)
 {