Merge branch 'main' of https://github.com/atlas-aai/dcm.m2

atlas-aai · Mar 20, 2023 · 9bb4be9 · 9bb4be9
2 parents 9e8230a + 0f2f368
commit 9bb4be9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/R/data-checks.R b/R/data-checks.R
@@ -91,7 +91,7 @@ check_pi_matrix <- function(pi_matrix, qmatrix) {
 
 check_qmatrix <- function(qmatrix, pi_matrix) {
   if (!is.data.frame(qmatrix)) {
-    stop("`pi_matrix` must be a data frame.",
+    stop("`qmatrix` must be a data frame.",
          call. = FALSE)
   }
 

diff --git a/R/m2.R b/R/m2.R
@@ -69,7 +69,8 @@ calc_m2 <- function(data, struc_params, pi_matrix, qmatrix, ci = 0.9,
     rep(2, nrow(qmatrix))
   } else if (model_type %in% c("LCDM", "GDINA")) {
     qmatrix %>%
-      modelr::model_matrix(stats::as.formula(paste0("~ .^", ncol(.)))) %>%
+      modelr::model_matrix(stats::as.formula(paste0("~ .^",
+                                                    max(ncol(.), 2)))) %>%
       dplyr::mutate(total_params = rowSums(.)) %>%
       dplyr::pull("total_params")
   } else if (model_type %in% c("ACDM", "LLM", "RRUM")) {