diff --git a/.gitignore b/.gitignore index 1030403d4..ac479d50e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ .Rproj.user .Rhistory .RData -brm.txt +brm.txt \ No newline at end of file diff --git a/DESCRIPTION b/DESCRIPTION index f2ceb6ade..b82ec05e1 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -6,7 +6,7 @@ Date: 2015-06-29 Authors@R: person("Paul-Christian", "Buerkner", email = "paul.buerkner@gmail.com", role = c("aut", "cre")) Depends: R (>= 3.1.0), ggplot2 (>= 1.0.1), Rcpp (>= 0.11.5) -Imports: methods, stats, abind, parallel (>= 3.1.3), coda (>= 0.17-1), ggmcmc (>= 0.6), gridExtra (>= 0.9.1) +Imports: methods, stats, grDevices, abind, parallel (>= 3.1.3), coda (>= 0.17-1), ggmcmc (>= 0.6), gridExtra (>= 0.9.1) Suggests: rstan (>= 2.6.0), R2jags (>= 0.05-03), testthat (>= 0.9.1) Description: Fit Bayesian generalized linear mixed models using Stan for full Bayesian inference. LazyData: true diff --git a/R/s3.methods.R b/R/s3.methods.R index c5836aa1e..fc61dafa4 100644 --- a/R/s3.methods.R +++ b/R/s3.methods.R @@ -416,8 +416,8 @@ plot.brmsfit <- function(x, parameters = NA, combine = FALSE, N = 5, ask = TRUE, rel.att <- c("class", "nChains", "nIterations", "nBurnin", "nThin", "description") pfit <- pfit[which(pfit$Parameter %in% pars),] - default.ask <- devAskNewPage() - devAskNewPage(ask = FALSE) + default.ask <- grDevices::devAskNewPage() + grDevices::devAskNewPage(ask = FALSE) for (i in 1:ceiling(length(pars)/N)) { pfit.sub1 <- pfit[which(pfit$Parameter %in% pars[((i-1)*N+1):min(i*N,length(pars))]),] for (j in 1:length(rel.att)) @@ -427,7 +427,7 @@ plot.brmsfit <- function(x, parameters = NA, combine = FALSE, N = 5, ask = TRUE, gridExtra::grid.arrange(ggmcmc::ggs_traceplot(pfit.sub1) + ggplot2::theme(legend.position = "none"), ggmcmc::ggs_density(pfit.sub2), ncol = 2, nrow = 1) - if (i == 1) devAskNewPage(ask = ask) + if (i == 1) grDevices::devAskNewPage(ask = ask) } - devAskNewPage(default.ask) + grDevices::devAskNewPage(default.ask) } \ No newline at end of file diff --git a/cran-comments.md b/cran-comments.md index 5c46b67e0..526c845a3 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,3 +1,6 @@ +## Resubsmission +* The NAMESPACE issue concerning function 'devAskNewPage' should now be solved. + ## Test environments * local Windows 8.1 install, R 3.2.0, R 3.3.0 * win-builder (devel and release)