Fix compact_list() for labelled + other vctrs classes #880
+42
−21
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| Version: 0.20.0 | ||
| Date: 2024-06-03 12:54:55 UTC | ||
| SHA: 40c4fbce021ca275d823719e60f74717ff61f33d |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,9 @@ | ||
| This release fixes errors in CRAN checks. | ||
|
|
||
| Additionally, in the process of stabilizing the API/user interface for packages | ||
| from the 'easystats' project, some argument names were renamed and old names | ||
| have been deprecated. This will *not break* downstream dependent packages, however, | ||
| reverse-dependency checks will raise warnings. We have already patched all | ||
| affected downstream packages and will submit them to CRAN in the next few days, | ||
| after the release of 'insight'. Once this release-cycle is complete, all | ||
| warnings due to deprecated argument names should be resolved. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,19 @@ | ||
| test_that("compact_list works as expected", { | ||
| expect_identical(compact_list(list(NULL, 1, c(NA, NA))), list(1, c(NA, NA))) | ||
| expect_identical(compact_list(c(1, NA, NA)), c(1, NA, NA)) | ||
| expect_identical(compact_list(list(NULL, 1, list(NULL, NULL))), list(1)) | ||
| expect_identical(compact_list(c(1, NA, NA), remove_na = TRUE), 1) | ||
| expect_identical(compact_list(c(1, 2, 3), remove_na = TRUE), c(1, 2, 3)) | ||
| expect_identical(compact_list(""), "") | ||
| expect_null(compact_list(NULL)) | ||
| expect_identical(compact_list(logical(0)), logical(0)) | ||
| }) | ||
|
|
||
| test_that("compact_list, logical > 1", { | ||
| x <- list(a = 1, b = c(1, 2), c = NA) | ||
| expect_identical(compact_list(x, remove_na = TRUE), list(a = 1, b = c(1, 2))) | ||
| expect_identical(compact_list(x, remove_na = FALSE), list(a = 1, b = c(1, 2), c = NA)) | ||
| x <- list(a = 1, b = c(NA, NA), c = NA) | ||
| expect_identical(compact_list(x, remove_na = TRUE), list(a = 1)) | ||
| expect_identical(compact_list(x, remove_na = FALSE), list(a = 1, b = c(NA, NA), c = NA)) | ||
| }) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| # Currently doesn't work on devel - potential fixest issue? | ||
| skip_if(TRUE) | ||
|
|
||
| skip_on_os("mac") | ||
Unchanged files with check annotations Beta
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| # utils --------------------- | ||
| .remove_pattern_from_names <- function(x, | ||
| ignore_asis = FALSE, | ||
| ignore_lag = FALSE, | ||
| is_emmeans = FALSE) { | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| out$Cleaned_Parameter <- gsub(pattern = "^b_(?!zi_)(.*)\\.(\\d)\\.$", "\\1[\\2]", out$Cleaned_Parameter, perl = TRUE) | ||
| out$Cleaned_Parameter <- gsub(pattern = "^b_zi_(.*)\\.(\\d)\\.$", "\\1[\\2]", out$Cleaned_Parameter, perl = TRUE) | ||
| out$Cleaned_Parameter <- gsub(pattern = "^(b_|bs_|bsp_|bcs_)(?!zi_)(.*)", "\\2", out$Cleaned_Parameter, perl = TRUE) | ||
| out$Cleaned_Parameter <- gsub(pattern = "^(b_zi_|bs_zi_|bsp_zi_|bcs_zi_)(.*)", "\\2", out$Cleaned_Parameter, perl = TRUE) | ||
| # correlation and sd | ||
| # replace "__" by "~" | ||
| cor_only <- startsWith(out$Parameter[cor_sd], "cor_") | ||
| if (any(cor_only)) { | ||
| out$Cleaned_Parameter[which(cor_sd)[cor_only]] <- sub("__", " ~ ", out$Cleaned_Parameter[which(cor_sd)[cor_only]], fixed = TRUE) | ||
| } | ||
| } | ||
| simplex <- startsWith(out$Cleaned_Parameter, "simo_") | ||
| if (length(simplex)) { | ||
| out$Cleaned_Parameter[simplex] <- gsub("^(simo_|simo_mo)(.*)\\[(\\d)\\]$", "\\2[\\3]", out$Cleaned_Parameter[simplex]) | ||
| out$Component[simplex] <- "simplex" | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| return(FALSE) | ||
| } | ||
| if ((cols <- Sys.getenv("RSTUDIO_CONSOLE_COLOR", "")) != "" && !is.na(as.numeric(cols))) { | ||
| return(TRUE) | ||
| } | ||
| # tools ----------------------------------- | ||
| .colour <- function(colour = "red", x) { | ||
| # replace "bright" suffixes to a generic color code | ||
| if (grepl("^(bright_|br_)", colour)) { | ||
| colour <- gsub("^(bright_|br_)", "b", colour) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| if (.is_singular(x, vals, tolerance = tolerance) && !(component %in% c("slope", "intercept"))) { | ||
| if (verbose) { | ||
| format_warning( | ||
| sprintf("Can't compute %s. Some variance components equal zero. Your model may suffer from singularity (see `?lme4::isSingular` and `?performance::check_singularity`).", name_full), | ||
| "Solution: Respecify random structure! You may also decrease the `tolerance` level to enforce the calculation of random effect variances." | ||
| ) | ||
| } | ||
| no_random_variance <- TRUE | ||
| if (faminfo$is_zero_inflated) { | ||
| .variance_zip(x, faminfo, family_var = mu) | ||
| } else if (inherits(x, "MixMod")) { | ||
| return(mu) | ||
| } else if (inherits(x, "cpglmm")) { | ||
| .get_cplm_family(x)$variance(mu) | ||
| } else { | ||
| if (length(rs) > length(fe)) rs <- rs[seq_along(fe)] | ||
| if (length(fe) > length(rs)) fe <- fe[seq_along(rs)] | ||
| all(mapply(function(r, f) all(r %in% f), rs, fe, SIMPLIFY = TRUE)) | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We shouldn't use lambdas here due to backwards compatibility.