nmixture vignette; few minor bug fixes

nicholasjclark · Jan 29, 2024 · 9354d4b · 9354d4b
1 parent c83c5ec
commit 9354d4b
Show file tree

Hide file tree

Showing 15 changed files with 1,551 additions and 4 deletions.
diff --git a/R/add_MACor.R b/R/add_MACor.R
@@ -19,11 +19,11 @@ add_MaCor = function(model_file,
         if(any(grepl('transformed data {', model_file, fixed = TRUE))){
           model_file[grep('transformed data {', model_file, fixed = TRUE)] <-
             paste0('transformed data {\n',
-                   'vector[n_series] trend_zeros = rep_vector(0.0, n_lv);')
+                   'vector[n_lv] trend_zeros = rep_vector(0.0, n_lv);')
         } else {
           model_file[grep('parameters {', model_file, fixed = TRUE)[1]] <-
             paste0('transformed data {\n',
-                   'vector[n_series] trend_zeros = rep_vector(0.0, n_lv);\n',
+                   'vector[n_lv] trend_zeros = rep_vector(0.0, n_lv);\n',
                    '}\nparameters {')
         }
 

diff --git a/R/ppc.mvgam.R b/R/ppc.mvgam.R
@@ -71,7 +71,7 @@ ppc.mvgam = function(object, newdata, data_test, series = 1, type = 'hist',
                                             "prop_zero"))
 
   if(type == 'rootogram'){
-    if(!object$family %in% c('poisson', 'negative binomial', 'tweedie')){
+    if(!object$family %in% c('poisson', 'negative binomial', 'tweedie', 'nmix')){
       stop('Rootograms not supported for checking non-count data',
            call. = FALSE)
     }
@@ -235,7 +235,7 @@ ppc.mvgam = function(object, newdata, data_test, series = 1, type = 'hist',
       preds <- mcmc_chains(object$model_output, 'ypred')[,starts[series]:ends[series]]
     }
 
-    preds <- preds[,1:length(truths)]
+    preds <- preds[,1:length(truths), drop = FALSE]
 
     if(NROW(preds) > 4000){
       preds <- preds[sample(1:NROW(preds), 4000, F), ]

diff --git a/docs/articles/nmixtures.html b/docs/articles/nmixtures.html
diff --git a/docs/articles/nmixtures_files/figure-html/unnamed-chunk-10-1.png b/docs/articles/nmixtures_files/figure-html/unnamed-chunk-10-1.png
diff --git a/docs/articles/nmixtures_files/figure-html/unnamed-chunk-11-1.png b/docs/articles/nmixtures_files/figure-html/unnamed-chunk-11-1.png
diff --git a/docs/articles/nmixtures_files/figure-html/unnamed-chunk-13-1.png b/docs/articles/nmixtures_files/figure-html/unnamed-chunk-13-1.png
diff --git a/docs/articles/nmixtures_files/figure-html/unnamed-chunk-13-2.png b/docs/articles/nmixtures_files/figure-html/unnamed-chunk-13-2.png
diff --git a/docs/articles/nmixtures_files/figure-html/unnamed-chunk-23-1.png b/docs/articles/nmixtures_files/figure-html/unnamed-chunk-23-1.png
diff --git a/docs/articles/nmixtures_files/figure-html/unnamed-chunk-24-1.png b/docs/articles/nmixtures_files/figure-html/unnamed-chunk-24-1.png
diff --git a/docs/articles/nmixtures_files/figure-html/unnamed-chunk-26-1.png b/docs/articles/nmixtures_files/figure-html/unnamed-chunk-26-1.png
diff --git a/docs/articles/nmixtures_files/figure-html/unnamed-chunk-26-2.png b/docs/articles/nmixtures_files/figure-html/unnamed-chunk-26-2.png
diff --git a/docs/articles/nmixtures_files/figure-html/unnamed-chunk-27-1.png b/docs/articles/nmixtures_files/figure-html/unnamed-chunk-27-1.png
diff --git a/src/mvgam.dll b/src/mvgam.dll
diff --git a/tests/testthat/Rplots.pdf b/tests/testthat/Rplots.pdf
diff --git a/vignettes/nmixtures.Rmd b/vignettes/nmixtures.Rmd