Merge pull request #319 from spsanderson/development

Fixes #311
spsanderson · Oct 11, 2022 · d48451d · d48451d
2 parents 9996206 + 000eed6
commit d48451d
Show file tree

Hide file tree

Showing 20 changed files with 20 additions and 57 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -17,6 +17,7 @@ passed arguments and fix `data.table` to directly pass ... arguments.
 5. Fix #309 - Add function for internal use to drop dependency of stringr. Function
 is `dist_type_extractor()` which is used for several functions in the library.
 6. Fix #310 - Update combine-multi-dist to use `dist_type_extractor()`
+7. Fix #311 - Update all `util_dist_stats_tbl()` functions to use `dist_type_extractor()`
 
 # TidyDensity 1.2.3
 

diff --git a/R/stats-bernoulli-tbl.R b/R/stats-bernoulli-tbl.R
@@ -71,9 +71,7 @@ util_bernoulli_stats_tbl <- function(.data) {
   ret <- dplyr::tibble(
     tidy_function = atb$tibble_type,
     function_call = atb$dist_with_params,
-    distribution = atb$tibble_type %>%
-      stringr::str_remove("tidy_") %>%
-      stringr::str_to_title(),
+    distribution = dist_type_extractor(atb$tibble_type),
     distribution_type = atb$distribution_family_type,
     points = atb$.n,
     simulations = atb$.num_sims,

diff --git a/R/stats-beta-tbl.R b/R/stats-beta-tbl.R
@@ -60,9 +60,7 @@ util_beta_stats_tbl <- function(.data) {
   ret <- dplyr::tibble(
     tidy_function = atb$tibble_type,
     function_call = atb$dist_with_params,
-    distribution = atb$tibble_type %>%
-      stringr::str_remove("tidy_") %>%
-      stringr::str_to_title(),
+    distribution = dist_type_extractor(atb$tibble_type),
     distribution_type = atb$distribution_family_type,
     points = atb$.n,
     simulations = atb$.num_sims,

diff --git a/R/stats-binomial-tbl.R b/R/stats-binomial-tbl.R
@@ -61,9 +61,7 @@ util_binomial_stats_tbl <- function(.data) {
   ret <- dplyr::tibble(
     tidy_function = atb$tibble_type,
     function_call = atb$dist_with_params,
-    distribution = atb$tibble_type %>%
-      stringr::str_remove("tidy_") %>%
-      stringr::str_to_title(),
+    distribution = dist_type_extractor(atb$tibble_type),
     distribution_type = atb$distribution_family_type,
     points = atb$.n,
     simulations = atb$.num_sims,

diff --git a/R/stats-cauchy-tbl.R b/R/stats-cauchy-tbl.R
@@ -60,9 +60,7 @@ util_cauchy_stats_tbl <- function(.data) {
   ret <- dplyr::tibble(
     tidy_function = atb$tibble_type,
     function_call = atb$dist_with_params,
-    distribution = atb$tibble_type %>%
-      stringr::str_remove("tidy_") %>%
-      stringr::str_to_title(),
+    distribution = dist_type_extractor(atb$tibble_type),
     distribution_type = atb$distribution_family_type,
     points = atb$.n,
     simulations = atb$.num_sims,

diff --git a/R/stats-chisquare-tbl.R b/R/stats-chisquare-tbl.R
@@ -65,9 +65,7 @@ util_chisquare_stats_tbl <- function(.data) {
   ret <- dplyr::tibble(
     tidy_function = atb$tibble_type,
     function_call = atb$dist_with_params,
-    distribution = atb$tibble_type %>%
-      stringr::str_remove("tidy_") %>%
-      stringr::str_to_title(),
+    distribution = dist_type_extractor(atb$tibble_type),
     distribution_type = atb$distribution_family_type,
     points = atb$.n,
     simulations = atb$.num_sims,

diff --git a/R/stats-exponential-tbl.R b/R/stats-exponential-tbl.R
@@ -60,9 +60,7 @@ util_exponential_stats_tbl <- function(.data) {
   ret <- dplyr::tibble(
     tidy_function = atb$tibble_type,
     function_call = atb$dist_with_params,
-    distribution = atb$tibble_type %>%
-      stringr::str_remove("tidy_") %>%
-      stringr::str_to_title(),
+    distribution = dist_type_extractor(atb$tibble_type),
     distribution_type = atb$distribution_family_type,
     points = atb$.n,
     simulations = atb$.num_sims,

diff --git a/R/stats-f-tbl.R b/R/stats-f-tbl.R
@@ -79,9 +79,7 @@ util_f_stats_tbl <- function(.data) {
   ret <- dplyr::tibble(
     tidy_function = atb$tibble_type,
     function_call = atb$dist_with_params,
-    distribution = atb$tibble_type %>%
-      stringr::str_remove("tidy_") %>%
-      stringr::str_to_title(),
+    distribution = dist_type_extractor(atb$tibble_type),
     distribution_type = atb$distribution_family_type,
     points = atb$.n,
     simulations = atb$.num_sims,

diff --git a/R/stats-gamma-tbl.R b/R/stats-gamma-tbl.R
@@ -59,9 +59,7 @@ util_gamma_stats_tbl <- function(.data) {
   ret <- dplyr::tibble(
     tidy_function = atb$tibble_type,
     function_call = atb$dist_with_params,
-    distribution = atb$tibble_type %>%
-      stringr::str_remove("tidy_") %>%
-      stringr::str_to_title(),
+    distribution = dist_type_extractor(atb$tibble_type),
     distribution_type = atb$distribution_family_type,
     points = atb$.n,
     simulations = atb$.num_sims,

diff --git a/R/stats-geometric-tbl.R b/R/stats-geometric-tbl.R
@@ -63,9 +63,7 @@ util_geometric_stats_tbl <- function(.data) {
   ret <- dplyr::tibble(
     tidy_function = atb$tibble_type,
     function_call = atb$dist_with_params,
-    distribution = atb$tibble_type %>%
-      stringr::str_remove("tidy_") %>%
-      stringr::str_to_title(),
+    distribution = dist_type_extractor(atb$tibble_type),
     distribution_type = atb$distribution_family_type,
     points = atb$.n,
     simulations = atb$.num_sims,

diff --git a/R/stats-hypergeometric-tbl.R b/R/stats-hypergeometric-tbl.R
@@ -72,9 +72,7 @@ util_hypergeometric_stats_tbl <- function(.data) {
   ret <- dplyr::tibble(
     tidy_function = atb$tibble_type,
     function_call = atb$dist_with_params,
-    distribution = atb$tibble_type %>%
-      stringr::str_remove("tidy_") %>%
-      stringr::str_to_title(),
+    distribution = dist_type_extractor(atb$tibble_type),
     distribution_type = atb$distribution_family_type,
     points = atb$.n,
     simulations = atb$.num_sims,

diff --git a/R/stats-logistic-tbl.R b/R/stats-logistic-tbl.R
@@ -61,9 +61,7 @@ util_logistic_stats_tbl <- function(.data) {
   ret <- dplyr::tibble(
     tidy_function = atb$tibble_type,
     function_call = atb$dist_with_params,
-    distribution = atb$tibble_type %>%
-      stringr::str_remove("tidy_") %>%
-      stringr::str_to_title(),
+    distribution = dist_type_extractor(atb$tibble_type),
     distribution_type = atb$distribution_family_type,
     points = atb$.n,
     simulations = atb$.num_sims,

diff --git a/R/stats-lognormal-tbl.R b/R/stats-lognormal-tbl.R
@@ -61,9 +61,7 @@ util_lognormal_stats_tbl <- function(.data) {
   ret <- dplyr::tibble(
     tidy_function = atb$tibble_type,
     function_call = atb$dist_with_params,
-    distribution = atb$tibble_type %>%
-      stringr::str_remove("tidy_") %>%
-      stringr::str_to_title(),
+    distribution = dist_type_extractor(atb$tibble_type),
     distribution_type = atb$distribution_family_type,
     points = atb$.n,
     simulations = atb$.num_sims,

diff --git a/R/stats-negative-binomial-tbl.R b/R/stats-negative-binomial-tbl.R
@@ -62,9 +62,7 @@ util_negative_binomial_stats_tbl <- function(.data) {
   ret <- dplyr::tibble(
     tidy_function = atb$tibble_type,
     function_call = atb$dist_with_params,
-    distribution = atb$tibble_type %>%
-      stringr::str_remove("tidy_") %>%
-      stringr::str_to_title(),
+    distribution = dist_type_extractor(atb$tibble_type),
     distribution_type = atb$distribution_family_type,
     points = atb$.n,
     simulations = atb$.num_sims,

diff --git a/R/stats-normal-tbl.R b/R/stats-normal-tbl.R
@@ -60,9 +60,7 @@ util_normal_stats_tbl <- function(.data) {
   ret <- dplyr::tibble(
     tidy_function = atb$tibble_type,
     function_call = atb$dist_with_params,
-    distribution = atb$tibble_type %>%
-      stringr::str_remove("tidy_") %>%
-      stringr::str_to_title(),
+    distribution = dist_type_extractor(atb$tibble_type),
     distribution_type = atb$distribution_family_type,
     points = atb$.n,
     simulations = atb$.num_sims,

diff --git a/R/stats-pareto-tbl.R b/R/stats-pareto-tbl.R
@@ -61,9 +61,7 @@ util_pareto_stats_tbl <- function(.data) {
   ret <- dplyr::tibble(
     tidy_function = atb$tibble_type,
     function_call = atb$dist_with_params,
-    distribution = atb$tibble_type %>%
-      stringr::str_remove("tidy_") %>%
-      stringr::str_to_title(),
+    distribution = dist_type_extractor(atb$tibble_type),
     distribution_type = atb$distribution_family_type,
     points = atb$.n,
     simulations = atb$.num_sims,

diff --git a/R/stats-poisson-tbl.R b/R/stats-poisson-tbl.R
@@ -60,9 +60,7 @@ util_poisson_stats_tbl <- function(.data) {
   ret <- dplyr::tibble(
     tidy_function = atb$tibble_type,
     function_call = atb$dist_with_params,
-    distribution = atb$tibble_type %>%
-      stringr::str_remove("tidy_") %>%
-      stringr::str_to_title(),
+    distribution = dist_type_extractor(atb$tibble_type),
     distribution_type = atb$distribution_family_type,
     points = atb$.n,
     simulations = atb$.num_sims,

diff --git a/R/stats-t-tbl.R b/R/stats-t-tbl.R
@@ -60,9 +60,7 @@ util_t_stats_tbl <- function(.data) {
   ret <- dplyr::tibble(
     tidy_function = atb$tibble_type,
     function_call = atb$dist_with_params,
-    distribution = atb$tibble_type %>%
-      stringr::str_remove("tidy_") %>%
-      stringr::str_to_title(),
+    distribution = dist_type_extractor(atb$tibble_type),
     distribution_type = atb$distribution_family_type,
     points = atb$.n,
     simulations = atb$.num_sims,

diff --git a/R/stats-uniform-tbl.R b/R/stats-uniform-tbl.R
@@ -64,9 +64,7 @@ util_uniform_stats_tbl <- function(.data) {
   ret <- dplyr::tibble(
     tidy_function = atb$tibble_type,
     function_call = atb$dist_with_params,
-    distribution = atb$tibble_type %>%
-      stringr::str_remove("tidy_") %>%
-      stringr::str_to_title(),
+    distribution = dist_type_extractor(atb$tibble_type),
     distribution_type = atb$distribution_family_type,
     points = atb$.n,
     simulations = atb$.num_sims,

diff --git a/R/stats-weibull-tbl.R b/R/stats-weibull-tbl.R
@@ -77,9 +77,7 @@ util_weibull_stats_tbl <- function(.data) {
   ret <- dplyr::tibble(
     tidy_function = atb$tibble_type,
     function_call = atb$dist_with_params,
-    distribution = atb$tibble_type %>%
-      stringr::str_remove("tidy_") %>%
-      stringr::str_to_title(),
+    distribution = dist_type_extractor(atb$tibble_type),
     distribution_type = atb$distribution_family_type,
     points = atb$.n,
     simulations = atb$.num_sims,