fixes

insightsengineering · Sep 6, 2023 · 4ba5455 · 4ba5455
1 parent c7c980e
commit 4ba5455
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/R/compare_variables.R b/R/compare_variables.R
@@ -379,6 +379,7 @@ compare_vars <- function(lyt,
                          .formats = NULL,
                          .labels = NULL,
                          .indent_mods = NULL) {
+  .stats <- .stats[!grepl("pval", .stats)] # tmp fix xxx
   extra_args <- list(.stats = .stats, na.rm = na.rm, na_level = na_level, compare = TRUE, ...)
   if (!is.null(.formats)) extra_args[[".formats"]] <- .formats
   if (!is.null(.labels)) extra_args[[".labels"]] <- .labels

diff --git a/R/utils_defaults_handling.R b/R/utils_defaults_handling.R
@@ -132,24 +132,24 @@ get_stats <- function(method_groups, type = NULL, stats_in = NULL, add_pval = FA
     add_pval <- TRUE
   }
 
+  # Filtering for stats_in (character vector)
+  if (!is.null(stats_in)) {
+    out <- intersect(stats_in, out) # It orders them too
+  }
+
   # Mainly used in "analyze_vars" but it could be necessary elsewhere
   if (isTRUE(add_pval)) {
     if (length(type) > 1) {
       stop("Only one type is allowed when add_pval = TRUE.")
     }
 
     if (!is.null(type) && "counts" %in% type) {
-        out <- unique(c(out, "pval_counts"))
+      out <- unique(c(out, "pval_counts"))
     } else {
-        out <- unique(c(out, "pval"))
+      out <- unique(c(out, "pval"))
     }
   }
 
-  # Filtering for stats_in (character vector)
-  if (!is.null(stats_in)) {
-    out <- intersect(stats_in, out) # It orders them too
-  }
-
   # If intersect did not find matches (and no pval?) -> error
   if (length(out) == 0) {
     stop(