use custom function to eval stats functions

javierfs · Jul 10, 2021 · 5299455 · 5299455
1 parent f37fb66
commit 5299455
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 65 deletions.
diff --git a/R/extract_stats.R b/R/extract_stats.R
@@ -49,3 +49,12 @@ extract_stats <- function(p, ...) {
     one_sample_data = tryCatch(p$plot_env$onesample_df, error = function(e) NULL)
   )
 }
+
+#' @noRd
+
+eval_f <- function(.f, ...) {
+  tryCatch(
+    suppressWarnings(suppressMessages(rlang::exec(.f, ...))),
+    error = function(e) NULL
+  )
+}
diff --git a/R/ggbarstats.R b/R/ggbarstats.R
@@ -112,18 +112,12 @@ ggbarstats <- function(data,
       top.text = caption
     )
 
-    subtitle_df <- tryCatch(rlang::exec(contingency_table, !!!.f.args, type = type),
-      error = function(e) NULL
-    )
-
+    subtitle_df <- eval_f(contingency_table, !!!.f.args, type = type)
     if (!is.null(subtitle_df)) subtitle <- subtitle_df$expression[[1]]
 
     # preparing Bayes Factor caption
     if (type != "bayes" && isTRUE(bf.message) && isFALSE(paired)) {
-      caption_df <- tryCatch(rlang::exec(contingency_table, !!!.f.args, type = "bayes"),
-        error = function(e) NULL
-      )
-
+      caption_df <- eval_f(contingency_table, !!!.f.args, type = "bayes")
       if (!is.null(caption_df)) caption <- caption_df$expression[[1]]
     }
   }

diff --git a/R/ggbetweenstats.R b/R/ggbetweenstats.R
@@ -259,20 +259,12 @@ ggbetweenstats <- function(data,
     )
 
     .f <- function_switch(test)
-
-    subtitle_df <- tryCatch(
-      rlang::exec(.f, !!!.f.args, type = type),
-      error = function(e) NULL
-    )
-
+    subtitle_df <- eval_f(.f, !!!.f.args, type = type)
     subtitle <- if (!is.null(subtitle_df)) subtitle_df$expression[[1]]
 
     # preparing the Bayes factor message
     if (type == "parametric" && isTRUE(bf.message)) {
-      caption_df <- tryCatch(rlang::exec(.f, !!!.f.args, type = "bayes"),
-        error = function(e) NULL
-      )
-
+      caption_df <- eval_f(.f, !!!.f.args, type = "bayes")
       caption <- if (!is.null(caption_df)) caption_df$expression[[1]]
     }
   }

diff --git a/R/ggdotplotstats.R b/R/ggdotplotstats.R
@@ -82,7 +82,7 @@ ggdotplotstats <- function(data,
   # ensure the variables work quoted or unquoted
   c(x, y) %<-% c(rlang::ensym(x), rlang::ensym(y))
 
-  # --------------------------- data preparation ----------------------------
+  # data -----------------------------------
 
   # creating a dataframe
   data %<>%
@@ -99,7 +99,7 @@ ggdotplotstats <- function(data,
       rank = dplyr::row_number()
     )
 
-  # ================ stats labels ==========================================
+  # statistical analysis ------------------------------------------
 
   if (isTRUE(results.subtitle)) {
     .f.args <- list(
@@ -115,18 +115,12 @@ ggdotplotstats <- function(data,
     )
 
     # preparing the subtitle with statistical results
-    subtitle_df <- tryCatch(rlang::exec(one_sample_test, !!!.f.args, type = type),
-      error = function(e) NULL
-    )
-
+    subtitle_df <- eval_f(one_sample_test, !!!.f.args, type = type)
     subtitle <- if (!is.null(subtitle_df)) subtitle_df$expression[[1]]
 
     # preparing the BF message
     if (type == "parametric" && isTRUE(bf.message)) {
-      caption_df <- tryCatch(rlang::exec(one_sample_test, !!!.f.args, type = "bayes"),
-        error = function(e) NULL
-      )
-
+      caption_df <- eval_f(one_sample_test, !!!.f.args, type = "bayes")
       caption <- if (!is.null(caption_df)) caption_df$expression[[1]]
     }
   }
@@ -139,7 +133,7 @@ ggdotplotstats <- function(data,
     ))
   }
 
-  # ------------------------------ basic plot ----------------------------
+  # plot -----------------------------------
 
   # creating the basic plot
   plot <- ggplot2::ggplot(data, mapping = ggplot2::aes({{ x }}, y = rank)) +
@@ -154,7 +148,7 @@ ggdotplotstats <- function(data,
         labels = 25 * 0:4
       )
     )
-  # ---------------- centrality tagging -------------------------------------
+  # centrality plotting -------------------------------------
 
   # using custom function for adding labels
   if (isTRUE(centrality.plotting)) {
@@ -168,7 +162,7 @@ ggdotplotstats <- function(data,
     )
   }
 
-  # ------------------------ annotations and themes -------------------------
+  # annotations -------------------------
 
   # specifying theme and labels for the final plot
   plot +

diff --git a/R/gghistostats.R b/R/gghistostats.R
@@ -105,7 +105,7 @@ gghistostats <- function(data,
   x_vec <- df %>% dplyr::pull({{ x }})
   if (is.null(binwidth)) binwidth <- (max(x_vec) - min(x_vec)) / sqrt(length(x_vec))
 
-  #  subtitle/caption preparation ------------------------
+  # statistical analysis ------------------------------------------
 
   if (isTRUE(results.subtitle)) {
     .f.args <- list(
@@ -121,18 +121,12 @@ gghistostats <- function(data,
     )
 
     # preparing the subtitle with statistical results
-    subtitle_df <- tryCatch(rlang::exec(one_sample_test, !!!.f.args, type = type),
-      error = function(e) NULL
-    )
-
+    subtitle_df <- eval_f(one_sample_test, !!!.f.args, type = type)
     subtitle <- if (!is.null(subtitle_df)) subtitle_df$expression[[1]]
 
     # preparing the BF message
     if (type == "parametric" && isTRUE(bf.message)) {
-      caption_df <- tryCatch(rlang::exec(one_sample_test, !!!.f.args, type = "bayes"),
-        error = function(e) NULL
-      )
-
+      caption_df <- eval_f(one_sample_test, !!!.f.args, type = "bayes")
       caption <- if (!is.null(caption_df)) caption_df$expression[[1]]
     }
   }
@@ -145,7 +139,7 @@ gghistostats <- function(data,
     ))
   }
 
-  # ============================= plot ====================================
+  # plot -----------------------------------
 
   # adding axes info
   plot <- ggplot2::ggplot(df, mapping = ggplot2::aes(x = {{ x }})) +

diff --git a/R/ggpiestats.R b/R/ggpiestats.R
@@ -154,18 +154,12 @@ ggpiestats <- function(data,
       top.text = caption
     )
 
-    subtitle_df <- tryCatch(rlang::exec(contingency_table, !!!.f.args, type = type),
-      error = function(e) NULL
-    )
-
+    subtitle_df <- eval_f(contingency_table, !!!.f.args, type = type)
     if (!is.null(subtitle_df)) subtitle <- subtitle_df$expression[[1]]
 
     # preparing Bayes Factor caption
     if (type != "bayes" && isTRUE(bf.message) && isFALSE(paired)) {
-      caption_df <- tryCatch(rlang::exec(contingency_table, !!!.f.args, type = "bayes"),
-        error = function(e) NULL
-      )
-
+      caption_df <- eval_f(contingency_table, !!!.f.args, type = "bayes")
       if (!is.null(caption_df)) caption <- caption_df$expression[[1]]
     }
   }

diff --git a/R/ggscatterstats.R b/R/ggscatterstats.R
@@ -162,16 +162,13 @@ ggscatterstats <- function(data,
       top.text = caption
     )
 
-    subtitle_df <- rlang::exec(corr_test, !!!.f.args, type = type)
-
+    subtitle_df <- eval_f(corr_test, !!!.f.args, type = type)
     subtitle <- if (!is.null(subtitle_df)) subtitle_df$expression[[1]]
 
-    # no need to use `tryCatch` because `correlation` already does this
     # preparing the BF message for null hypothesis support
     if (type == "parametric" && isTRUE(bf.message)) {
-      caption_df <- rlang::exec(corr_test, !!!.f.args, type = "bayes")
-
-      caption <- caption_df$expression[[1]]
+      caption_df <- eval_f(corr_test, !!!.f.args, type = "bayes")
+      caption <- if (!is.null(caption_df)) caption_df$expression[[1]]
     }
   }
 

diff --git a/R/ggwithinstats.R b/R/ggwithinstats.R
@@ -167,20 +167,12 @@ ggwithinstats <- function(data,
     )
 
     .f <- function_switch(test)
-
-    subtitle_df <- tryCatch(
-      rlang::exec(.f, !!!.f.args, type = type),
-      error = function(e) NULL
-    )
-
+    subtitle_df <- eval_f(.f, !!!.f.args, type = type)
     subtitle <- if (!is.null(subtitle_df)) subtitle_df$expression[[1]]
 
     # preparing the Bayes factor message
     if (type == "parametric" && isTRUE(bf.message)) {
-      caption_df <- tryCatch(rlang::exec(.f, !!!.f.args, type = "bayes"),
-        error = function(e) NULL
-      )
-
+      caption_df <- eval_f(.f, !!!.f.args, type = "bayes")
       caption <- if (!is.null(caption_df)) caption_df$expression[[1]]
     }
   }