fixed get_data_from & SiegelTukey

qddyy · Sep 14, 2023 · 989efe3 · 989efe3
1 parent 6b19987
commit 989efe3
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 14 deletions.
diff --git a/R/SiegelTukey.R b/R/SiegelTukey.R
@@ -27,8 +27,6 @@ SiegelTukey <- R6Class(
             private$.adjust_median <- adjust_median
 
             super$initialize(...)
-
-            private$.scoring <- "siegel-tukey rank"
         }
     ),
     private = list(
@@ -41,15 +39,16 @@ SiegelTukey <- R6Class(
         .calculate_extra = function() {},
 
         .calculate_score = function() {
-            x <- private$.data$x
-            y <- private$.data$y
-
             if (private$.adjust_median) {
-                x <- x - median(x)
-                y <- y - median(y)
+                private$.data <- lapply(
+                    private$.data, function(x) x - median(x)
+                )
             }
 
-            c_xy <- c(x, y)
+            super$.calculate_score()
+            private$.scoring <- "siegel-tukey rank"
+
+            c_xy <- c(private$.data$x, private$.data$y)
             N <- length(c_xy)
 
             rank_l <- outer(c(1, 4), seq.int(from = 0, to = N - 1, by = 4), "+")
@@ -66,11 +65,13 @@ SiegelTukey <- R6Class(
             }
 
             st_rank <- vapply(
-                X = split(c(rank_l, rev(rank_r)), sort(c_xy)),
-                FUN = mean, FUN.VALUE = numeric(1)
+                X = split(c(rank_l, rev(rank_r)), seq_len(N)),
+                FUN = mean, FUN.VALUE = numeric(1), USE.NAMES = FALSE
             )
 
-            private$.data <- list(x = st_rank[as.character(x)], y = st_rank[as.character(y)])
+            private$.data <- lapply(
+                private$.data, function(x) st_rank[x]
+            )
         }
     )
 )
diff --git a/R/TwoSampleTest.R b/R/TwoSampleTest.R
@@ -22,10 +22,12 @@ TwoSampleTest <- R6Class(
         },
 
         .calculate_score = function() {
-            scores <- get_score(c(private$.data$x, private$.data$y), method = private$.scoring)
+            score <- get_score(
+                c(private$.data$x, private$.data$y), method = private$.scoring
+            )
 
             x_index <- seq_along(private$.data$x)
-            private$.data <- list(x = scores[x_index], y = scores[-x_index])
+            private$.data <- list(x = score[x_index], y = score[-x_index])
         },
 
         .calculate_statistic = function() {

diff --git a/R/auxiliary_funcs.R b/R/auxiliary_funcs.R
@@ -8,7 +8,7 @@ get_data_from <- function(...) {
     if (length(data) == 1 & is.list(data[[1]])) {
         data <- data[[1]]
     }
-    if (all(vapply(data, length, numeric(1)) >= 2)) data
+    if (all(vapply(data, length, numeric(1)) >= 2)) as.list(data)
 }
 
 # for .calculate_score