Skip to content

Commit ff7cd8f

Browse files
authored
Merge pull request #103 from emstruong/options
Options
2 parents d623630 + 6fa35cf commit ff7cd8f

File tree

7 files changed

+14
-13
lines changed

7 files changed

+14
-13
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Description: Fit a variety of Bayesian latent variable models, including confirm
3434
factor analysis, structural equation models, and latent growth curve models. References: Merkle & Rosseel (2018) <doi:10.18637/jss.v085.i04>; Merkle et al. (2021) <doi:10.18637/jss.v100.i06>.
3535
License: GPL (>= 3)
3636
ByteCompile: true
37-
Depends: R(>= 3.5.0), methods, Rcpp(>= 0.12.15)
37+
Depends: R(>= 4.1.0), methods, Rcpp(>= 0.12.15)
3838
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, igraph
3939
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)
4040
Suggests: runjags(>= 2.0.4-3), modeest(>= 2.3.3), rjags, cmdstanr, semTools, blavsam, tinytest

R/blavaan.R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ blavaan <- function(..., # default lavaan arguments
1111
mcmcextra = list(),
1212
inits = "simple",
1313
convergence = "manual",
14-
target = "stan",
14+
target = getOption("blavaan.target", "stan"),
1515
save.lvs = FALSE,
1616
wiggle = NULL,
1717
wiggle.sd = 0.1,
@@ -1196,7 +1196,7 @@ blavaan <- function(..., # default lavaan arguments
11961196
bcfa <- bsem <- function(..., cp = "srs", dp = NULL,
11971197
n.chains = 3, burnin, sample, adapt,
11981198
mcmcfile = FALSE, mcmcextra = list(), inits = "simple",
1199-
convergence = "manual", target = "stan", save.lvs = FALSE, wiggle = NULL,
1199+
convergence = "manual", target = getOption("blavaan.target", "stan"), save.lvs = FALSE, wiggle = NULL,
12001200
wiggle.sd = 0.1, prisamp = FALSE, jags.ic = FALSE, seed = NULL,
12011201
bcontrol = list()) {
12021202

@@ -1237,7 +1237,7 @@ bcfa <- bsem <- function(..., cp = "srs", dp = NULL,
12371237
bgrowth <- function(..., cp = "srs", dp = NULL,
12381238
n.chains = 3, burnin, sample, adapt,
12391239
mcmcfile = FALSE, mcmcextra = list(), inits = "simple",
1240-
convergence = "manual", target = "stan", save.lvs = FALSE, wiggle = NULL,
1240+
convergence = "manual", target = getOption("blavaan.target", "stan"), save.lvs = FALSE, wiggle = NULL,
12411241
wiggle.sd = 0.1, prisamp = FALSE, jags.ic = FALSE, seed = NULL,
12421242
bcontrol = list()) {
12431243

R/zzz.R

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
fields="Version")
44
packageStartupMessage("This is ",paste(pkgname, version))
55
packageStartupMessage('On multicore systems, we suggest use of future::plan("multicore") or\n', ' future::plan("multisession") for faster post-MCMC computations.')
6+
packageStartupMessage('If cmdstanr is installed, consider setting options(blavaan.target = "cmdstan") for speed.')
67
}
78

man/bcfa.Rd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ Fit a Confirmatory Factor Analysis (CFA) model.}
77
bcfa(..., cp = "srs",
88
dp = NULL, n.chains = 3, burnin, sample,
99
adapt, mcmcfile = FALSE, mcmcextra = list(), inits = "simple",
10-
convergence = "manual", target = "stan", save.lvs = FALSE,
11-
wiggle = NULL, wiggle.sd = 0.1, prisamp = FALSE, jags.ic = FALSE,
12-
seed = NULL, bcontrol = list())
10+
convergence = "manual", target = getOption("blavaan.target", "stan"),
11+
save.lvs = FALSE, wiggle = NULL, wiggle.sd = 0.1, prisamp = FALSE,
12+
jags.ic = FALSE, seed = NULL, bcontrol = list())
1313
}
1414
\arguments{
1515
\item{...}{Default lavaan arguments. See \code{\link[lavaan]{lavaan}}.}

man/bgrowth.Rd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Fit a Growth Curve model.}
66
\usage{
77
bgrowth(..., cp = "srs", dp = NULL, n.chains = 3,
88
burnin, sample, adapt, mcmcfile = FALSE, mcmcextra = list(),
9-
inits = "simple", convergence = "manual", target = "stan",
9+
inits = "simple", convergence = "manual", target = getOption("blavaan.target", "stan"),
1010
save.lvs = FALSE, wiggle = NULL, wiggle.sd = 0.1, prisamp = FALSE,
1111
jags.ic = FALSE, seed = NULL, bcontrol = list())
1212
}

man/blavaan.Rd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ Fit a Bayesian latent variable model.}
77
blavaan(..., cp = "srs",
88
dp = NULL, n.chains = 3, burnin, sample,
99
adapt, mcmcfile = FALSE, mcmcextra = list(), inits = "simple",
10-
convergence = "manual", target = "stan", save.lvs = FALSE,
11-
wiggle = NULL, wiggle.sd = 0.1, prisamp = FALSE, jags.ic = FALSE,
10+
convergence = "manual", target = getOption("blavaan.target", "stan"),
11+
save.lvs = FALSE, wiggle = NULL, wiggle.sd = 0.1, prisamp = FALSE, jags.ic = FALSE,
1212
seed = NULL, bcontrol = list())
1313
}
1414
\arguments{

man/bsem.Rd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ Fit a Structural Equation Model (SEM).}
77
bsem(..., cp = "srs",
88
dp = NULL, n.chains = 3, burnin, sample,
99
adapt, mcmcfile = FALSE, mcmcextra = list(), inits = "simple",
10-
convergence = "manual", target = "stan", save.lvs = FALSE,
11-
wiggle = NULL, wiggle.sd = 0.1, prisamp = FALSE, jags.ic = FALSE,
12-
seed = NULL, bcontrol = list())
10+
convergence = "manual", target = getOption("blavaan.target", "stan"),
11+
save.lvs = FALSE, wiggle = NULL, wiggle.sd = 0.1, prisamp = FALSE,
12+
jags.ic = FALSE, seed = NULL, bcontrol = list())
1313
}
1414
\arguments{
1515
\item{...}{Default lavaan arguments. See \code{\link[lavaan]{lavaan}}.}

0 commit comments

Comments
 (0)