Fixed probing computation

Author: mchiapello

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: Rwaves
 Title: Electropenetrography (EPG) data analysis
-Version: 0.0.2
+Version: 0.0.3
 Authors@R:c( 
     person(given = "Marco",
            family = "Chiapello",

NEWS.md

@@ -1,3 +1,11 @@
+# Rwaves 0.0.3
+
+* Fix probing number 
+
+* Fix probing number time computation
+
+* Update the processed dataframe to reflect the new computed data
+
 # Rwaves 0.0.2
 
 * Updated the formulas. Now the compute values are correct

R/functions.R

@@ -79,12 +79,12 @@ rwaves <- function(x){
     ff24 <- function(x){
         newname <- paste0("f", 24)
         x$cum <- c(diff(x$time), x$time[length(x$time)])
-        temp <- x %>%
+        temp <- (x %>% filter(waveforms != 99) %>% pull(cum) %>% sum()) - x %>%
            dplyr::filter(waveforms == 1) %>%
            dplyr::group_by(waveforms) %>%
            dplyr::summarize(Sum = sum(cum)) %>%
            dplyr::pull(Sum)
-       dplyr::tibble(!!newname := x$time[nrow(x)] - temp)
+       dplyr::tibble(!!newname := temp)
     }
     # %probtimeinC
     ff115 <- function(x, d = 2){
@@ -101,7 +101,7 @@ rwaves <- function(x){
            dplyr::summarize(Sum = sum(cum)) %>%
            dplyr::pull(Sum)
        dplyr::tibble(!!newname := temp / tt * 100)
-q   }
+  }
     ###########################################################################
     # FUNCTION
     ## Intermediate table