diff --git a/DESCRIPTION b/DESCRIPTION index d76c8965..70d6e8b0 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: blavaan Title: Bayesian Latent Variable Analysis -Version: 0.5-7 +Version: 0.5-8 Authors@R: c(person(given = "Edgar", family = "Merkle", role = c("aut", "cre"), email = "merklee@missouri.edu", @@ -37,7 +37,7 @@ ByteCompile: true Depends: R(>= 3.5.0), methods, Rcpp(>= 0.12.15) Imports: stats, utils, graphics, lavaan(>= 0.6-18), coda, mnormt, nonnest2(>= 0.5-7), loo(>= 2.0), rstan(>= 2.26.0), rstantools(>= 1.5.0), RcppParallel (>= 5.0.1), bayesplot, Matrix, future.apply, tmvnsim LinkingTo: StanHeaders (>= 2.26.0), rstan (>= 2.26.0), BH (>= 1.69.0), Rcpp (>= 0.12.15), RcppEigen (>= 0.3.3.4.0), RcppParallel (>= 5.0.1) -Suggests: runjags(>= 2.0.4-3), modeest(>= 2.3.3), rjags, cmdstanr, semTools, bsam, tinytest +Suggests: runjags(>= 2.0.4-3), modeest(>= 2.3.3), rjags, cmdstanr, semTools, blavsam, tinytest SystemRequirements: GNU make NeedsCompilation: yes URL: https://ecmerkle.github.io/blavaan/, https://github.com/ecmerkle/blavaan diff --git a/R/blavaan.R b/R/blavaan.R index e14f3944..389064e7 100644 --- a/R/blavaan.R +++ b/R/blavaan.R @@ -697,7 +697,7 @@ blavaan <- function(..., # default lavaan arguments fnm <- paste0(jagdir, "/sem.", fext) if(target %in% c("stan", "cmdstan")){ if(mcmcextra$dosam){ - cat(getFromNamespace("stanmodels", "bsam")$stanmarg_bsam@model_code, file = fnm) + cat(getFromNamespace("stanmodels", "blavsam")$stanmarg_bsam@model_code, file = fnm) } else { cat(stanmodels$stanmarg@model_code, file = fnm) } @@ -726,7 +726,7 @@ blavaan <- function(..., # default lavaan arguments } else if(target == "cmdstan"){ rjarg <- with(jagtrans, list(data = data, init = inits)) } else if(mcmcextra$dosam){ - rjarg <- with(jagtrans, list(object = getFromNamespace("stanmodels", "bsam")$stanmarg_bsam, + rjarg <- with(jagtrans, list(object = getFromNamespace("stanmodels", "blavsam")$stanmarg_bsam, data = data, pars = sampparms, init = inits)) @@ -759,7 +759,7 @@ blavaan <- function(..., # default lavaan arguments fname <- paste0("stanmarg_", packageDescription("blavaan")["Version"]) fdir <- paste0(cmdstanr::cmdstan_path(), "/") if(mcmcextra$dosam) { - obj <- getFromNamespace("stanmodels", "bsam")$stanmarg_bsam + obj <- getFromNamespace("stanmodels", "blavsam")$stanmarg_bsam } else { obj <- stanmodels$stanmarg }