Release 2 3 2

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: seminr
 Type: Package
 Title: Building and Estimating Structural Equation Models
-Version: 2.3.1
-Date: 2022-06-30
+Version: 2.3.2
+Date: 2022-10-12
 Authors@R: c(person("Soumya", "Ray", email = "soumya.ray@gmail.com", role = c("aut", "ths")),
              person("Nicholas Patrick", "Danks", email = "nicholasdanks@hotmail.com", role = c("aut","cre")),
              person("André", "Calero Valdez", role = "aut", email = "andrecalerovaldez@gmail.com"),

R/estimate_bootstrap.R

@@ -181,11 +181,11 @@ bootstrap_model <- function(seminr_model, nboot = 500, cores = NULL, seed = NULL
       filled_rows <- apply(paths_descriptives != 0, 1, any, na.rm=TRUE)
       paths_descriptives <- subset(paths_descriptives, filled_rows, filled_cols)
 
-      # Get the number of DVs
-      if (length(unique(structural_model[,"target"])) == 1) {
-        dependant <- unique(structural_model[,"target"])
+      # Get the names of endogenous variables
+      if (length(all_endogenous(structural_model)) == 1) {
+        dependant <- all_endogenous(structural_model)
       } else {
-        dependant <- colnames(paths_descriptives[, 1:length(unique(structural_model[,"target"]))])
+        dependant <- colnames(paths_descriptives[, 1:length(all_endogenous(structural_model)), drop = F])
       }
 
       # Construct the vector of column names

R/feature_higher_order.R

@@ -87,9 +87,11 @@ HOCs_in_model <- function(measurement_model, structural_model = NULL) {
   # Get subset of HOCs also present in structural model, if one is provided
   if (length(HOCs) > 0) {
     output <- list()
+    j <- 1
     for (i in 1:length(HOCs)) {
       if(HOCs[[i]][1] %in% construct_names(structural_model)) {
-        output[[i]] <- HOCs[[i]]
+        output[[j]] <- HOCs[[i]]
+        j <- j + 1
       }
     }
   } else {

R/library.R

@@ -225,7 +225,7 @@ return_only_composite_scores <- function(object){
 total_effects <- function(path_coef) {
   output <- path_coef
   paths <- path_coef
-  while (sum(paths) > 0) {
+  while (sum(paths) != 0) {
     paths <- paths %*% path_coef
     output <- output + paths
   }

R/plot_dot.R

@@ -743,10 +743,8 @@ format_edge_label <- function(template, variable, value) {
 }
 
 #' Returns the type of a construct from a model
-#'
 #' @param model the model to get the type from
 #' @param construct the character string name of the construct
-#'
 #' @return Returns a character string
 get_construct_type <- function(model, construct) {
   #if (!(construct %in% model$constructs)) {
@@ -885,7 +883,8 @@ extract_sm_nodes <- function(model, theme, structure_only = FALSE) {
 
     if (startsWith(construct_type, "HOC") && !structure_only) {
 
-      row_index <- grepl(construct, model$mmMatrix[,1])
+      # row_index <- grepl(construct, model$mmMatrix[,1])
+      row_index <- model$mmMatrix[,1] == construct
       result <- model$mmMatrix[row_index, 2]
       sm_nodes <- c(sm_nodes, result)
     }