fix error, for slim and drop args

ConnorDonegan · Jun 3, 2023 · d612e20 · d612e20
1 parent 874df77
commit d612e20
Show file tree

Hide file tree

Showing 25 changed files with 111 additions and 89 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@ man/*.Rd
 cran-comments.md
 /doc/
 /Meta/
+CRAN-RELEASE
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: geostan
 Title: Bayesian Spatial Analysis
-Version: 0.5.0
+Version: 0.5.1
 Date: 2023-05-29
 URL: https://connordonegan.github.io/geostan/
 BugReports: https://github.com/ConnorDonegan/geostan/issues

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,10 @@
 
+# geostan 0.5.1
+
+### Minor fixes
+
+This release fixes some issues that were introduced with the `slim` and `drop` arguments (in v0.5.0).
+
 # geostan 0.5.0
 
 ## New additions

diff --git a/R/internal-functions.R b/R/internal-functions.R
@@ -205,7 +205,7 @@ clean_results <- function(samples, pars, is_student, has_re, Wx, x, x_me_idx) {
         b_names = dimnames(x)[[2]] 
         samples <- par_alias(samples, "^beta\\[", b_names)
     }
-    if (sum(x_me_idx)) {
+    if ('x_true' %in% pars) {
         x_names <- dimnames(x)[[2]]        
         for (i in seq_along(x_me_idx)) {
             x.id <- paste0("x_", rep(x_names[x_me_idx[i]], times = n), paste0("[", 1:n, "]"))
@@ -392,7 +392,7 @@ empty_sar_data <- function(n) {
 #' @noRd
 drop_params <- function(pars, drop_list) {
     if (!is.null(drop_list)) {
-        drop <- paste0(drop_list, collapse = "|")
+        drop <- paste0("^", drop_list, "$", collapse = "|")
         keep_idx <- !grepl(drop, pars)
         pars <- pars[keep_idx]
     }        

diff --git a/R/stan_icar.R b/R/stan_icar.R
@@ -205,8 +205,6 @@
 #'
 #' @examples
 #' \donttest{
-#' # for parallel processing of models:
-#' #options(mc.cores = parallel::detectCores())
 #' data(sentencing)
 #' C <- shape2mat(sentencing, "B")
 #' log_e <- log(sentencing$expected_sents)

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html
diff --git a/docs/LICENSE.html b/docs/LICENSE.html
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/articles/raster-regression.html b/docs/articles/raster-regression.html
diff --git a/docs/articles/raster-regression_files/figure-html/unnamed-chunk-2-1.png b/docs/articles/raster-regression_files/figure-html/unnamed-chunk-2-1.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,3 +13,4 @@ man/*.Rd @@
     cran-comments.md
     /doc/
     /Meta/
+    CRAN-RELEASE