Merge pull request #29 from poissonconsulting/pmbr

poissonconsulting · Oct 1, 2023 · a847bf7 · a847bf7
2 parents 2343397 + e73b5fb
commit a847bf7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/tests/testthat/test-model.R b/tests/testthat/test-model.R
@@ -109,10 +109,12 @@ r2 <- 1 - var(Males - eMales) / var(Males)
 "
 
   model <- model(
-    template,  gen_inits,
+    code = template,
+    gen_inits = gen_inits,
     select_data = list(Males = 1, "Disturbance*" = 1, Year = factor(1), PDO = 1, "HunterDays*" = 1),
     modify_data = modify_data,
-    new_expr = new_expr,  drops = list("bDisturbance", "bPDO", "bHunterDays"))
+    new_expr = new_expr,  drops = list("bDisturbance", "bPDO", "bHunterDays")
+  )
 
   models <- make_all_models(model)
 

diff --git a/tests/testthat/test-zzzanalyse.R b/tests/testthat/test-zzzanalyse.R
@@ -47,7 +47,7 @@ data <- bauw::peregrine
 data$Annual <- factor(data$Year)
 
 
-model <- model(tmb_template, gen_inits = gen_inits,
+model <- model(code = tmb_template, gen_inits = gen_inits,
                select_data = list("Pairs" = integer(), "Year*" = integer(), Annual = factor()),
                random_effects = list(bAnnual = "Annual"),
                new_expr = new_expr)