easystats · etiennebacher · Dec 14, 2024 · Jun 21, 2024 · Nov 24, 2024 · Dec 3, 2024
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -31,7 +31,7 @@ License: MIT + file LICENSE
 URL: https://easystats.github.io/datawizard/
 BugReports: https://github.com/easystats/datawizard/issues
 Depends:
-    R (>= 3.6)
+    R (>= 4.0)
 Imports:
     insight (>= 1.0.0),
     stats,

diff --git a/NEWS.md b/NEWS.md
@@ -2,6 +2,8 @@
 
 BREAKING CHANGES AND DEPRECATIONS
 
+* *datawizard* now requires R >= 4.0 (#515).
+
 * Argument `drop_na` in `data_match()` is deprecated now. Please use 
   `remove_na` instead.
 

diff --git a/R/categorize.R b/R/categorize.R
@@ -363,7 +363,6 @@ categorize.grouped_df <- function(x,
 }
 
 
-
 # tools --------------------
 
 .equal_range <- function(x, range, n_groups, lowest = NULL) {

diff --git a/R/data_arrange.R b/R/data_arrange.R
@@ -27,7 +27,6 @@ data_arrange <- function(data, select = NULL, safe = TRUE) {
 }
 
 
-
 #' @export
 data_arrange.default <- function(data, select = NULL, safe = TRUE) {
   if (is.null(select) || length(select) == 0) {
@@ -100,7 +99,6 @@ data_arrange.default <- function(data, select = NULL, safe = TRUE) {
 }
 
 
-
 #' @export
 data_arrange.grouped_df <- function(data, select = NULL, safe = TRUE) {
   grps <- attr(data, "groups", exact = TRUE)

diff --git a/R/data_match.R b/R/data_match.R
@@ -106,7 +106,7 @@
                       match = "and",
                       return_indices = FALSE,
                       remove_na = TRUE,
                       drop_na,
                       ...) {
  if (!is.data.frame(to)) {
    to <- as.data.frame(to)
@@ -182,7 +182,6 @@
 }
 
 
-
 #' @rdname data_match
 #' @export
 data_filter <- function(x, ...) {

diff --git a/R/data_read.R b/R/data_read.R
@@ -127,7 +127,6 @@ data_read <- function(path,
 }
 
 
-
 # helper -----------------------
 
 .file_ext <- function(x) {
@@ -156,7 +155,6 @@ data_read <- function(path,
 }
 
 
-
 # process imported data from SPSS, SAS or Stata -----------------------
 
 .post_process_imported_data <- function(x, convert_factors, verbose) {
@@ -225,7 +223,6 @@ data_read <- function(path,
 }
 
 
-
 # read functions -----------------------
 
 .read_spss <- function(path, encoding, convert_factors, verbose, ...) {

diff --git a/R/data_relocate.R b/R/data_relocate.R
@@ -139,7 +139,6 @@ data_relocate <- function(data,
 }
 
 
-
 #' @rdname data_relocate
 #' @export
 data_reorder <- function(data,

diff --git a/R/data_rescale.R b/R/data_rescale.R
@@ -82,7 +82,6 @@ change_scale <- function(x, ...) {
 }
 
 
-
 #' @export
 rescale.default <- function(x, verbose = TRUE, ...) {
   if (isTRUE(verbose)) {
@@ -94,7 +93,6 @@ rescale.default <- function(x, verbose = TRUE, ...) {
 }
 
 
-
 #' @rdname rescale
 #' @export
 rescale.numeric <- function(x,
@@ -233,7 +231,6 @@ rescale.grouped_df <- function(x,
 }
 
 
-
 #' @rdname rescale
 #' @export
 rescale.data.frame <- function(x,

diff --git a/R/data_reverse.R b/R/data_reverse.R
@@ -115,7 +115,6 @@ reverse.numeric <- function(x,
 }
 
 
-
 #' @export
 reverse.factor <- function(x, range = NULL, verbose = TRUE, ...) {
   # Warning if all NaNs
@@ -195,7 +194,6 @@ reverse.factor <- function(x, range = NULL, verbose = TRUE, ...) {
 }
 
 
-
 #' @export
 reverse.grouped_df <- function(x,
                                select = NULL,
@@ -254,7 +252,6 @@ reverse.grouped_df <- function(x,
 }
 
 
-
 #' @rdname reverse
 #' @export
 reverse.data.frame <- function(x,

diff --git a/R/data_tabulate.R b/R/data_tabulate.R
@@ -690,8 +690,6 @@ print_md.datawizard_tables <- function(x, big_mark = NULL, ...) {
 }
 
 
-
-
 # tools --------------------
 
 .table_header <- function(x, format = "text") {

diff --git a/R/data_write.R b/R/data_write.R
@@ -114,8 +114,6 @@ data_write <- function(data,
 }
 
 
-
-
 # helper -------------------------------
 
 

diff --git a/R/describe_distribution.R b/R/describe_distribution.R
@@ -499,8 +499,6 @@ describe_distribution.grouped_df <- function(x,
 }
 
 
-
-
 # methods ------------------
 
 #' @export

diff --git a/R/descriptives.R b/R/descriptives.R
@@ -153,8 +153,6 @@ coef_var.numeric <- function(x, mu = NULL, sigma = NULL,
 }
 
 
-
-
 # descriptives helpers
 
 .drop_na <- function(x) {

diff --git a/R/normalize.R b/R/normalize.R
@@ -56,7 +56,6 @@ normalize <- function(x, ...) {
 }
 
 
-
 #' @rdname normalize
 #' @export
 normalize.numeric <- function(x, include_bounds = TRUE, verbose = TRUE, ...) {

diff --git a/R/ranktransform.R b/R/ranktransform.R
@@ -33,7 +33,6 @@
 }
 
 
-
 #' @rdname ranktransform
 #' @export
 ranktransform.numeric <- function(x,
@@ -55,7 +54,7 @@
    }

    if (verbose) {
      insight::format_warning(paste0("Variable `", name, "` contains only one unique value and will not be normalized."))
    }

    return(x)
@@ -71,7 +70,7 @@
    }

    if (verbose) {
      insight::format_warning(paste0("Variable `", name, "` contains only two different values. Consider converting it to a factor."))
    }
  }

@@ -89,16 +88,12 @@
 }
 
 
-
-
 #' @export
 ranktransform.factor <- function(x, ...) {
   x
 }
 
 
-
-
 #' @export
 ranktransform.grouped_df <- function(x,
                                      select = NULL,

diff --git a/R/rescale_weights.R b/R/rescale_weights.R
@@ -133,9 +133,6 @@ rescale_weights <- function(data, by, probability_weights, nest = FALSE) {
 }
 
 
-
-
-
 # rescale weights, for one or more group variables ----------------------------
 
 .rescale_weights <- function(x, group, probability_weights, n, weight_non_na) {
@@ -172,7 +169,6 @@ rescale_weights <- function(data, by, probability_weights, nest = FALSE) {
 }
 
 
-
 # rescale weights, for nested groups ----------------------------
 
 .rescale_weights_nested <- function(x, group, probability_weights, n, weight_non_na) {

diff --git a/R/select_nse.R b/R/select_nse.R
@@ -199,11 +199,12 @@
 
 # small helper, to avoid duplicated code
 .action_if_not_found <- function(
-    x,
-    columns,
-    matches,
-    verbose,
-    ifnotfound) {
+  x,
+  columns,
+  matches,
+  verbose,
+  ifnotfound
+) {
   msg <- paste0(
     "Following variable(s) were not found: ",
     toString(x[is.na(matches)])

diff --git a/R/skewness_kurtosis.R b/R/skewness_kurtosis.R
@@ -227,7 +227,6 @@ skewness.default <- function(x,
 }
 
 
-
 # Kurtosis -----------------------------------
 
 
@@ -432,7 +431,6 @@ summary.parameters_kurtosis <- function(object, test = FALSE, ...) {
 }
 
 
-
 # bootstrapping -----------------------------------
 
 .boot_skewness <- function(data, indices, remove_na, type) {

diff --git a/R/smoothness.R b/R/smoothness.R
@@ -39,13 +39,13 @@
  }

  if (method == "cor") {
    smooth <- stats::cor(utils::head(x, length(x) - lag), utils::tail(x, length(x) - lag))
  } else {
    smooth <- stats::sd(diff(x, lag = lag)) / abs(mean(diff(x, lag = lag)))
  }

  if (!is.null(iterations)) {
    if (!requireNamespace("boot", quietly = TRUE)) {
      insight::format_warning("Package 'boot' needed for bootstrapping SEs.")
    } else {
      results <- boot::boot(
@@ -56,7 +56,7 @@
        lag = lag
      )
      out_se <- stats::sd(results$t, na.rm = TRUE)
      smooth <- data.frame(Smoothness = smooth, SE = out_se)
    }
  }

@@ -100,8 +100,6 @@
 }
 
 
-
-
 # bootstrapping -----------------------------------
 
 .boot_smoothness <- function(data, indices, method, lag) {
@@ -114,8 +112,6 @@
 }
 
 
-
-
 # methods -----------------------------------------
 
 #' @export

diff --git a/R/standardize.R b/R/standardize.R
@@ -309,7 +309,6 @@ standardize.data.frame <- function(x,
 }
 
 
-
 #' @export
 standardize.grouped_df <- function(x,
                                    select = NULL,
@@ -382,9 +381,6 @@ standardize.grouped_df <- function(x,
 }
 
 
-
-
-
 # Datagrid ----------------------------------------------------------------
 
 #' @export

diff --git a/R/standardize.models.R b/R/standardize.models.R
@@ -104,10 +104,10 @@
                                weights = TRUE,
                                verbose = TRUE,
                                include_response = TRUE,
                                update_expr,
                                ...) {
  m_info <- .get_model_info(x, ...)
  data <- insight::get_data(x, source = "mf", verbose = FALSE)

  if (isTRUE(attr(data, "is_subset"))) {
    insight::format_error("Cannot standardize a model fit with a 'subset = '.")
@@ -120,7 +120,6 @@
   }
 
 
-
   ## ---- Z the RESPONSE? ----
   # 1. Some models have special responses that should not be standardized. This
   # includes:
@@ -158,7 +157,6 @@
   }
 
 
-
   ## ---- DO NOT Z: ----
 
   # 1. WEIGHTS:
@@ -202,7 +200,6 @@
   }
 
 
-
   ## ---- STANDARDIZE! ----
 
   w <- insight::get_weights(x, remove_na = TRUE)
@@ -255,19 +252,13 @@
   }
 
 
-
-
-
   ## ---- ADD BACK VARS THAT WHERE NOT Z ----
   if (length(dont_standardize)) {
     remaining_columns <- intersect(colnames(data), dont_standardize)
     data_std <- cbind(data[, remaining_columns, drop = FALSE], data_std)
   }
 
 
-
-
-
   ## ---- UPDATE MODEL WITH Z DATA ----
   on.exit(.update_failed())
 
@@ -373,7 +364,7 @@


  if (!is.null(covs)) {
    covs <- mapply(.rescale_fixed_values, covs, names(covs),
      SIMPLIFY = FALSE,
      MoreArgs = list(
        y_data = y_data, m_data = m_data,
@@ -447,9 +438,6 @@
 # biglm doesn't regit the model to new data - it ADDs MORE data to the model.
 
 
-
-
-
 # helper ----------------------------
 
 # Find log-terms inside model formula, and return "clean" term names

diff --git a/R/text_format.R b/R/text_format.R
@@ -102,7 +102,6 @@ text_paste <- function(text, text2 = NULL, sep = ", ", enclose = NULL, ...) {
 }
 
 
-
 #' @rdname text_format
 #' @export
 text_remove <- function(text, pattern = "", ...) {

diff --git a/R/to_numeric.R b/R/to_numeric.R
@@ -280,7 +280,6 @@ to_numeric.character <- function(x,
 }
 
 
-
 #' Convert to Numeric (if possible)
 #'
 #' Tries to convert vector to numeric if possible (if no warnings or errors).

diff --git a/R/unstandardize.R b/R/unstandardize.R
@@ -151,7 +151,6 @@ unstandardize.character <- function(x, ...) {
 }
 
 
-
 #' @export
 unstandardize.grouped_df <- function(x,
                                      center = NULL,
@@ -261,7 +260,6 @@ unstandardize.matrix <- function(x,
 unstandardize.array <- unstandardize.matrix
 
 
-
 # Datagrid ----------------------------------------------------------------
 
 #' @export

diff --git a/R/utils-cols.R b/R/utils-cols.R
@@ -74,8 +74,6 @@ row_to_colnames <- function(x, row = 1, na_prefix = "x", verbose = TRUE) {
 }
 
 
-
-
 #' @rdname colnames
 #' @export
 colnames_to_row <- function(x, prefix = "x") {

diff --git a/R/utils-rows.R b/R/utils-rows.R
@@ -79,7 +79,6 @@ column_as_rownames <- function(x, var = "rowname") {
 }
 
 
-
 #' @rdname rownames
 #' @export
 #' @examples

diff --git a/R/visualisation_recipe.R b/R/visualisation_recipe.R
@@ -78,7 +78,6 @@ print.visualisation_recipe <- function(x, ...) {
 }
 
 
-
 #' @export
 plot.visualisation_recipe <- function(x, ...) {
   insight::check_if_installed("see")
Original file line number	Diff line number	Diff line change
Expand Up		@@ -363,7 +363,6 @@ categorize.grouped_df <- function(x,
		}



		# tools --------------------

		.equal_range <- function(x, range, n_groups, lowest = NULL) {
Expand Down
-Original file line number
+Diff line change
@@ Expand Up / @@ -139,7 +139,6 @@ data_relocate <- function(data, @@
     }
     #' @rdname data_relocate
     #' @export
     data_reorder <- function(data,
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -690,8 +690,6 @@ print_md.datawizard_tables <- function(x, big_mark = NULL, ...) {
		}




		# tools --------------------

		.table_header <- function(x, format = "text") {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -114,8 +114,6 @@ data_write <- function(data,
		}




		# helper -------------------------------


Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -499,8 +499,6 @@ describe_distribution.grouped_df <- function(x,
		}




		# methods ------------------

		#' @export
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -153,8 +153,6 @@ coef_var.numeric <- function(x, mu = NULL, sigma = NULL,
		}




		# descriptives helpers

		.drop_na <- function(x) {
Expand Down