improve handling of defined parameters in blavInspect for #98

Author: ecmerkle

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: blavaan
 Title: Bayesian Latent Variable Analysis
-Version: 0.5-9.1371
+Version: 0.5-9.1372
 Authors@R: c(person(given = "Edgar", family = "Merkle",
                     role = c("aut", "cre"),
                     email = "merklee@missouri.edu",

R/blav_object_inspect.R

@@ -84,18 +84,44 @@ blavInspect <- function(blavobject, what, ...) {
             if(add.labels) names(OUT) <- labs
             OUT
         } else if(what %in% c("mcmc", "draws", "samples", "hpd")){
-            ## add defined parameters to labels
+            ## add defined parameters to labels or, for stan, compute defined parameters
             pt <- blavobject@ParTable
-            pt$free[pt$op == ":="] <- max(pt$free, na.rm = TRUE) + 1:sum(pt$op == ":=")
-            labs <- lav_partable_labels(pt, type = "free")
-            draws <- make_mcmc(blavobject@external$mcmcout)
-            draws <- lapply(draws, function(x) mcmc(x[, idx, drop = FALSE]))
-            draws <- mcmc.list(draws)
-            if(add.labels) {
+            if (!(blavobject@Options$target %in% c("stan", "cmdstan", "vb"))) {
+                pt$free[pt$op == ":="] <- max(pt$free, na.rm = TRUE) + 1:sum(pt$op == ":=")
+                labs <- lav_partable_labels(pt, type = "free")
+                draws <- make_mcmc(blavobject@external$mcmcout)
+                draws <- lapply(draws, function(x) mcmc(x[, idx, drop = FALSE]))
+                draws <- mcmc.list(draws)
+                if(add.labels) {
+                    for (i in 1:length(draws)) {
+                        colnames(draws[[i]]) <- labs
+                    }
+                }
+            } else {
+              labs <- lav_partable_labels(pt, type = "free")
+              draws <- make_mcmc(blavobject@external$mcmcout)
+              draws <- lapply(draws, function(x) mcmc(x[, idx, drop = FALSE]))
+              draws <- mcmc.list(draws)
+              labs <- lav_partable_labels(pt, type = "free")
+              if(add.labels) {
                 for (i in 1:length(draws)) {
-                    colnames(draws[[i]]) <- labs
+                  colnames(draws[[i]]) <- labs
                 }
+              }
+
+              ndef <- sum(pt$op == ":=")
+              if (ndef > 0) {
+                defpt <- which(pt$op == ":=")
+                for (j in 1:length(draws)) {
+                  for (i in defpt) {
+                    thisop <- pt$rhs[i]
+                    draws[[j]] <- cbind(draws[[j]], eval(parse(text = thisop), envir = as.data.frame(draws[[j]])))
+                    colnames(draws[[j]])[ncol(draws[[j]])] <- pt$lhs[i]
+                  }
+                }
+              }
             }
+                  
             if(what == "hpd"){
                 pct <- .95
                 if("level" %in% dotNames) pct <- dotdotdot$level