diff --git a/DESCRIPTION b/DESCRIPTION index b8170839f..1c6f4f90e 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: sdmTMB Title: Spatial and Spatiotemporal SPDE-Based GLMMs with 'TMB' -Version: 0.4.2.9002 +Version: 0.4.2.9003 Authors@R: c( person(c("Sean", "C."), "Anderson", , "sean@seananderson.ca", role = c("aut", "cre"), diff --git a/NEWS.md b/NEWS.md index 81d6bb3b0..39a93285a 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,7 +1,8 @@ # sdmTMB (development version) -* Add the generalized gamma distribution (thanks to J. Thorson). - See `gengamma()`. #286 +* Add the generalized gamma distribution (thanks to J.T. Thorson with additional + work by J.C. Dunic.) See `gengamma()`. This distribution is still in a testing + phase and is not recommended for applied use yet. #286 * Fix bug in `get_cog(..., format = "wide")` where the time column was hardcoded to `"year"` by accident. diff --git a/tests/testthat/test-3-families.R b/tests/testthat/test-3-families.R index bcc12f33d..642460d5b 100644 --- a/tests/testthat/test-3-families.R +++ b/tests/testthat/test-3-families.R @@ -433,6 +433,8 @@ test_that("Binomial simulation/residuals works with weights argument or cbind()" }) test_that("Generalized gamma works", { + skip_on_cran() + skip_on_ci() d <- subset(pcod_2011, density > 0) fit1 <- sdmTMB( density ~ 1 + depth_scaled, @@ -477,6 +479,9 @@ test_that("Generalized gamma works", { test_that("Generalized gamma matches Gamma when Q = sigma", { + skip_on_cran() + skip_on_ci() + # Generate values drawn from generaliased gamma distribution given the mean of those values rgengamma <- function(n, mean, sigma, Q) { # Get mu from mean @@ -523,14 +528,14 @@ test_that("Generalized gamma matches Gamma when Q = sigma", { fit1 <- sdmTMB( y ~ x, data = d, - spatial = "off", + spatial = "off", family = gengamma(link = "log") ) - + fit2 <- sdmTMB( y ~ x, data = d, - spatial = "off", + spatial = "off", family = Gamma(link = "log") ) diff --git a/tests/testthat/test-delta.R b/tests/testthat/test-delta.R index ed0134c2a..823f3d0b8 100644 --- a/tests/testthat/test-delta.R +++ b/tests/testthat/test-delta.R @@ -182,6 +182,7 @@ test_that("Anisotropy with delta model", { test_that("Delta-Gengamma family fits", { skip_on_cran() + skip_on_ci() fit_dgg <- sdmTMB(density ~ 1, data = pcod, mesh = pcod_spde, @@ -237,4 +238,4 @@ test_that("delta_gengamma() Poisson-link family fits", { fit_pgg$sd_report s <- as.list(fit_pgg$sd_report, "Std. Error") expect_true(sum(is.na(s$b_j)) == 0L) -}) \ No newline at end of file +})