add back ega

easystats · Oct 26, 2023 · 9de0d04 · 9de0d04
1 parent 4297d00
commit 9de0d04
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 44 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -115,6 +115,7 @@ Suggests:
     drc,
     DRR,
     effectsize (>= 0.8.2),
+    EGAnet,
     emmeans (>= 1.7.0),
     estimatr,
     factoextra,

diff --git a/NEWS.md b/NEWS.md
@@ -8,9 +8,6 @@
 * `print_md()` for `compare_parameters()` now gains more arguments, similar to
   the `print()` method.
 
-* `n_factors()` no longer supports `package = "EGAnet"`, as package *EGAnet* was
-  removed from CRAN.
-
 * `bootstrap_parameters()` and `model_parameters()` now accept bootstrapped
   samples returned by `bootstrap_model()`.
 

diff --git a/R/n_factors.R b/R/n_factors.R
@@ -245,27 +245,25 @@ n_factors <- function(x,
     }
   }
 
-  # EGAnet was removed from CRAN
-
   # EGAnet -------------------------------------------
-  # if ("EGAnet" %in% package) {
-  #   insight::check_if_installed("EGAnet")
-
-  #   if (safe) {
-  #     out <- rbind(
-  #       out,
-  #       tryCatch(.n_factors_ega(x, cor, nobs, eigen_values, type),
-  #         # warning = function(w) data.frame(),
-  #         error = function(e) data.frame()
-  #       )
-  #     )
-  #   } else {
-  #     out <- rbind(
-  #       out,
-  #       .n_factors_ega(x, cor, nobs, eigen_values, type)
-  #     )
-  #   }
-  # }
+  if ("EGAnet" %in% package) {
+    insight::check_if_installed("EGAnet")
+
+    if (safe) {
+      out <- rbind(
+        out,
+        tryCatch(.n_factors_ega(x, cor, nobs, eigen_values, type),
+          # warning = function(w) data.frame(),
+          error = function(e) data.frame()
+        )
+      )
+    } else {
+      out <- rbind(
+        out,
+        .n_factors_ega(x, cor, nobs, eigen_values, type)
+      )
+    }
+  }
 
 
   # psych -------------------------------------------
@@ -545,28 +543,26 @@ print.n_clusters <- print.n_factors
 }
 
 
-# EGAnet was removed from CRAN
-
 # EGAnet ------------------------
-# .n_factors_ega <- function(x = NULL,
-#                            cor = NULL,
-#                            nobs = NULL,
-#                            eigen_values = NULL,
-#                            type = "FA") {
-#   # Replace with own correlation matrix
-#   junk <- utils::capture.output(suppressWarnings(suppressMessages(
-#     nfac_glasso <- EGAnet::EGA(cor, n = nobs, model = "glasso", plot.EGA = FALSE)$n.dim # nolint
-#   )))
-#   junk <- utils::capture.output(suppressWarnings(suppressMessages(
-#     nfac_TMFG <- EGAnet::EGA(cor, n = nobs, model = "TMFG", plot.EGA = FALSE)$n.dim # nolint
-#   )))
-
-#   .data_frame(
-#     n_Factors = as.numeric(c(nfac_glasso, nfac_TMFG)),
-#     Method = c("EGA (glasso)", "EGA (TMFG)"),
-#     Family = "EGA"
-#   )
-# }
+.n_factors_ega <- function(x = NULL,
+                           cor = NULL,
+                           nobs = NULL,
+                           eigen_values = NULL,
+                           type = "FA") {
+  # Replace with own correlation matrix
+  junk <- utils::capture.output(suppressWarnings(suppressMessages(
+    nfac_glasso <- EGAnet::EGA(cor, n = nobs, model = "glasso", plot.EGA = FALSE)$n.dim # nolint
+  )))
+  junk <- utils::capture.output(suppressWarnings(suppressMessages(
+    nfac_TMFG <- EGAnet::EGA(cor, n = nobs, model = "TMFG", plot.EGA = FALSE)$n.dim # nolint
+  )))
+
+  .data_frame(
+    n_Factors = as.numeric(c(nfac_glasso, nfac_TMFG)),
+    Method = c("EGA (glasso)", "EGA (TMFG)"),
+    Family = "EGA"
+  )
+}
 
 
 # psych ------------------------