Merge pull request #21 from poissonconsulting/pmbr

poissonconsulting · Oct 1, 2023 · 27157bf · 27157bf
2 parents 50605fd + 4b2ccdf
commit 27157bf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/tests/testthat/test-model.R b/tests/testthat/test-model.R
@@ -32,7 +32,7 @@ test_that("analyse", {
     prediction[i] <- exp(bIntercept + bYear * Year[i] + bHabitatQuality[HabitatQuality[i]] + bSiteYear[Site[i], YearFactor[i]])
 } "
 
-  model <- model(template,
+  model <- model(code = template,
                  select_data = list("Year+" = numeric(), YearFactor = factor(),
                                     Site = factor(), Density = numeric(),
                                     HabitatQuality = factor()),

diff --git a/tests/testthat/test-zzz-analyse.R b/tests/testthat/test-zzz-analyse.R
@@ -39,7 +39,7 @@ test_that("analyse character vector", {
     residual[i] <- res_lnorm(Density[i], fit[i], exp(log_sDensity))
 }"
 
-  model <- model(jags_template,
+  model <- model(code = jags_template,
                  select_data = list("Year+" = numeric(), YearFactor = factor(),
                                     Site = factor(), Density = numeric(),
                                     HabitatQuality = factor()),
@@ -55,8 +55,8 @@ test_that("analyse character vector", {
   expect_true(all(as.integer(data2$YearFactor) == 1L))
   # need random seed so repeatable
   R2c <- R2(analysis, "Density")
-  expect_gt(R2c, 0.6)
-  expect_lt(R2c, 0.8)
+  expect_gt(R2c, 0.5)
+  expect_lt(R2c, 0.9)
 
   R2m <- R2(analysis, "Density", marginal = TRUE)
   expect_gt(R2m, 0.0)
@@ -171,7 +171,7 @@ test_that("analyse vectorized stand alone character", {
     residual[i] <- res_lnorm(Density[i], fit[i], exp(log_sDensity))
 }"
 
-  model <- model(jags_template,
+  model <- model(code = jags_template,
                  select_data = list("Year+" = numeric(), YearFactor = factor(),
                                     Site = factor(), Density = numeric(),
                                     HabitatQuality = factor()),
@@ -187,8 +187,8 @@ test_that("analyse vectorized stand alone character", {
   expect_true(all(as.integer(data2$YearFactor) == 1L))
   # need random seed so repeatable
   R2c <- R2(analysis, "Density")
-  expect_gt(R2c, 0.6)
-  expect_lt(R2c, 0.8)
+  expect_gt(R2c, 0.5)
+  expect_lt(R2c, 0.9)
 
   R2m <- R2(analysis, "Density", marginal = TRUE)
   expect_gt(R2m, 0.0)
@@ -268,7 +268,7 @@ test_that("analyse vectorized embedded expression", {
   data <- embr::density99
   data$YearFactor <- factor(data$Year)
 
-  model <- model("model{
+  model <- model(code = "model{
 
   bIntercept ~ dnorm(0, 5^-2)
   bYear ~ dnorm(0, .5^-2) # bYear2 ~ dnorm(0, .5^-2)
@@ -314,8 +314,8 @@ random_effects = list(bSiteYear = c("Site", "YearFactor")))
   expect_true(all(as.integer(data2$YearFactor) == 1L))
   # need random seed so repeatable
   R2c <- R2(analysis, "Density")
-  expect_gt(R2c, 0.6)
-  expect_lt(R2c, 0.8)
+  expect_gt(R2c, 0.5)
+  expect_lt(R2c, 0.9)
 
   R2m <- R2(analysis, "Density", marginal = TRUE)
   expect_gt(R2m, 0.0)