Skip to content
Merged
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 59 additions & 37 deletions R/model_performance.lavaan.R
Original file line number Diff line number Diff line change
Expand Up @@ -102,47 +102,70 @@
model_performance.lavaan <- function(model, metrics = "all", verbose = TRUE, ...) {
insight::check_if_installed("lavaan")

# Check if convergeed
if(insight::is_converged(model)) {

Check warning on line 106 in R/model_performance.lavaan.R

View workflow job for this annotation

GitHub Actions / lint-changed-files / lint-changed-files

file=R/model_performance.lavaan.R,line=106,col=5,[spaces_left_parentheses_linter] Place a space before left parenthesis, except in a function call.
if (isTRUE(verbose)) {
measures <- as.data.frame(t(as.data.frame(lavaan::fitmeasures(model, ...))))
} else {
measures <- as.data.frame(t(as.data.frame(suppressWarnings(lavaan::fitmeasures(model, ...)))))
}

if (isTRUE(verbose)) {
measures <- as.data.frame(t(as.data.frame(lavaan::fitmeasures(model, ...))))
row.names(measures) <- NULL

out <- data.frame(
Chi2 = measures$chisq,
Chi2_df = measures$df,
p_Chi2 = measures$pvalue,
Baseline = measures$baseline.chisq,
Baseline_df = measures$baseline.df,
p_Baseline = measures$baseline.pvalue,
GFI = measures$gfi,
AGFI = measures$agfi,
NFI = measures$nfi,
NNFI = measures$tli,
CFI = measures$cfi,
RMSEA = measures$rmsea,
RMSEA_CI_low = measures$rmsea.ci.lower,
RMSEA_CI_high = measures$rmsea.ci.upper,
p_RMSEA = measures$rmsea.pvalue,
RMR = measures$rmr,
SRMR = measures$srmr,
RFI = measures$rfi,
PNFI = measures$pnfi,
IFI = measures$ifi,
RNI = measures$rni,
Loglikelihood = measures$logl,
AIC = measures$aic,
BIC = measures$bic,
BIC_adjusted = measures$bic2
)

if (all(metrics == "all")) {
metrics <- names(out)
}
out <- out[, metrics, drop = FALSE]
} else {
measures <- as.data.frame(t(as.data.frame(suppressWarnings(lavaan::fitmeasures(model, ...)))))
}
insight::format_warning("This lavaan model did not converge, no performance indices can be computed. Returning `NA`.")

Check warning on line 148 in R/model_performance.lavaan.R

View workflow job for this annotation

GitHub Actions / lint-changed-files / lint-changed-files

file=R/model_performance.lavaan.R,line=148,col=121,[line_length_linter] Lines should not be more than 120 characters. This line is 122 characters.

row.names(measures) <- NULL
# All possible metrics that this function can return.
all_metric_names <- c(
"Chi2", "Chi2_df", "p_Chi2", "Baseline", "Baseline_df", "p_Baseline", "GFI",
"AGFI", "NFI", "NNFI", "CFI", "RMSEA", "RMSEA_CI_low", "RMSEA_CI_high",
"p_RMSEA", "RMR", "SRMR", "RFI", "PNFI", "IFI", "RNI", "Loglikelihood",
"AIC", "BIC", "BIC_adjusted"
)

out <- data.frame(
Chi2 = measures$chisq,
Chi2_df = measures$df,
p_Chi2 = measures$pvalue,
Baseline = measures$baseline.chisq,
Baseline_df = measures$baseline.df,
p_Baseline = measures$baseline.pvalue,
GFI = measures$gfi,
AGFI = measures$agfi,
NFI = measures$nfi,
NNFI = measures$tli,
CFI = measures$cfi,
RMSEA = measures$rmsea,
RMSEA_CI_low = measures$rmsea.ci.lower,
RMSEA_CI_high = measures$rmsea.ci.upper,
p_RMSEA = measures$rmsea.pvalue,
RMR = measures$rmr,
SRMR = measures$srmr,
RFI = measures$rfi,
PNFI = measures$pnfi,
IFI = measures$ifi,
RNI = measures$rni,
Loglikelihood = measures$logl,
AIC = measures$aic,
BIC = measures$bic,
BIC_adjusted = measures$bic2
)
if (is.character(metrics) && !all(metrics == "all")) {
out_names <- intersect(metrics, all_metric_names)
} else {
out_names <- all_metric_names
}

if (all(metrics == "all")) {
metrics <- names(out)
out <- as.data.frame(stats::setNames(
rep(list(NA), length(out_names)),
out_names
))
}
out <- out[, metrics]

class(out) <- c("performance_lavaan", "performance_model", class(out))
out
Expand All @@ -153,7 +176,6 @@
model_performance.blavaan <- function(model, metrics = "all", verbose = TRUE, ...) {
insight::check_if_installed(c("lavaan", "blavaan"))


if (isTRUE(verbose)) {
measures <- as.data.frame(t(as.data.frame(lavaan::fitmeasures(model, ...))))
fitind <- summary(blavaan::blavFitIndices(model))
Expand Down Expand Up @@ -186,7 +208,7 @@
if (all(metrics == "all")) {
metrics <- names(out)
}
out <- out[, metrics]
out <- out[, metrics, drop = FALSE]

class(out) <- c("performance_lavaan", "performance_model", class(out))
out
Expand Down
Loading