Merge branch 'main' into main

easystats · Jun 19, 2022 · 18480f7 · 18480f7
2 parents 823490c + 9b5aef1
commit 18480f7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -6,6 +6,13 @@
   `options("parameters_cimethod" = FALSE)` (#722). By default, these messages
   are displayed.
 
+* `model_parameters()` now supports objects from package _marginaleffects_ and
+  objects returned by `car::linearHypothesis()`.
+
+* Added `predict()` method to `cluster_meta` objects.
+
+* Reorganization of docs for `model_parameters()`.
+
 ## Changes to functions
 
 * `model_parameters()` now also includes standard errors and confidence
@@ -24,6 +31,9 @@
 * Fixed issue with argument `column_names` in `compare_parameters()` when 
   strings contained characters that needed to be escaped for regular expressions.
 
+* Fixed issues with unknown arguments in `model_parameters()` for *lavaan* models
+  when `standardize = TRUE`.
+
 # parameters 0.18.0
 
 ## Breaking Changes

diff --git a/R/extract_random_variances.R b/R/extract_random_variances.R
@@ -244,43 +244,39 @@ as.data.frame.VarCorr.lme <- function(x, row.names = NULL, optional = FALSE, ...
     to <- c(which(grps) - 1, length(grps))[-1]
     out_sd <- do.call(rbind, lapply(1:length(from), function(i) {
       values <- stddevs[from[i]:to[i]]
-      data.frame(
+      .data_frame(
         grp = gsub("(.*) =$", "\\1", names(values[1])),
         var1 = names(values[-1]),
         var2 = NA_character_,
-        sdcor = unname(values[-1]),
-        stringsAsFactors = FALSE
+        sdcor = unname(values[-1])
       )
     }))
     if (!is.null(corrs)) {
       out_cor <- do.call(rbind, lapply(1:length(from), function(i) {
         values <- corrs[from[i]:to[i]]
-        data.frame(
+        .data_frame(
           grp = gsub("(.*) =$", "\\1", names(values[1])),
           var1 = "(Intercept)",
           var2 = names(values[-1]),
-          sdcor = unname(values[-1]),
-          stringsAsFactors = FALSE
+          sdcor = unname(values[-1])
         )
       }))
     } else {
       out_cor <- NULL
     }
   } else {
-    out_sd <- data.frame(
+    out_sd <- .data_frame(
       grp = gsub("(.*) =(.*)", "\\1", attributes(x)$title),
       var1 = names(stddevs),
       var2 = NA_character_,
-      sdcor = unname(stddevs),
-      stringsAsFactors = FALSE
+      sdcor = unname(stddevs)
     )
     if (!is.null(corrs)) {
-      out_cor <- data.frame(
+      out_cor <- .data_frame(
         grp = gsub("(.*) =(.*)", "\\1", attributes(x)$title),
         var1 = "(Intercept)",
         var2 = names(corrs),
-        sdcor = unname(corrs),
-        stringsAsFactors = FALSE
+        sdcor = unname(corrs)
       )
     } else {
       out_cor <- NULL