Skip to content

Commit

Permalink
avoid reference to bsam for next release (unavailable repo)
Browse files Browse the repository at this point in the history
  • Loading branch information
ecmerkle committed Jun 9, 2024
1 parent b395a34 commit b970b32
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: blavaan
Title: Bayesian Latent Variable Analysis
Version: 0.5-4.1280
Version: 0.5-4.1283
Authors@R: c(person(given = "Edgar", family = "Merkle",
role = c("aut", "cre"),
email = "[email protected]",
Expand Down Expand Up @@ -37,7 +37,7 @@ ByteCompile: true
Depends: R(>= 3.5.0), methods, Rcpp(>= 0.12.15)
Imports: stats, utils, graphics, lavaan(>= 0.6-17), coda, mnormt, nonnest2(>= 0.5-5), 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, tinytest
SystemRequirements: GNU make
NeedsCompilation: yes
URL: https://ecmerkle.github.io/blavaan/, https://github.com/ecmerkle/blavaan
Expand Down
14 changes: 7 additions & 7 deletions R/blavaan.R
Original file line number Diff line number Diff line change
Expand Up @@ -695,8 +695,8 @@ blavaan <- function(..., # default lavaan arguments
fext <- ifelse(target=="jags", "jag", "stan")
fnm <- paste0(jagdir, "/sem.", fext)
if(target %in% c("stan", "cmdstan")){
if(mcmcextra$dosam){
cat(bsam::stanmodels$stanmarg_bsam@model_code, file = fnm)
if(FALSE){#mcmcextra$dosam){
#cat(bsam::stanmodels$stanmarg_bsam@model_code, file = fnm)
} else {
cat(stanmodels$stanmarg@model_code, file = fnm)
}
Expand Down Expand Up @@ -724,11 +724,11 @@ blavaan <- function(..., # default lavaan arguments
init = inits))
} else if(target == "cmdstan"){
rjarg <- with(jagtrans, list(data = data, init = inits))
} else if(mcmcextra$dosam){
rjarg <- with(jagtrans, list(object = bsam::stanmodels$stanmarg_bsam,
data = data,
pars = sampparms,
init = inits))
} else if(FALSE){#mcmcextra$dosam){
#rjarg <- with(jagtrans, list(object = bsam::stanmodels$stanmarg_bsam,
# data = data,
# pars = sampparms,
# init = inits))
} else {
rjarg <- with(jagtrans, list(object = stanmodels$stanmarg,
data = data,
Expand Down

0 comments on commit b970b32

Please sign in to comment.