Skip to content

Commit 078ff39

Browse files
committed
Update tests
1 parent 75ff396 commit 078ff39

File tree

3 files changed

+20
-7
lines changed

3 files changed

+20
-7
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ License: GPL (>= 3)
3535
Encoding: UTF-8
3636
LazyData: true
3737
Roxygen: list(markdown = TRUE)
38-
RoxygenNote: 7.2.3
38+
RoxygenNote: 7.3.2
3939
URL: https://github.com/tece-lab/DAISIEutils, https://tece-lab.github.io/DAISIEutils/
4040
BugReports: https://github.com/tece-lab/DAISIEutils/issues
4141
Depends: R (>= 4.2.0)

man/DAISIEutils-package.Rd

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/testthat/test-setup_model.R

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,11 @@ test_that("setup_model is correct for rr_lac_di", {
156156
),
157157
cs_version = list(
158158
model = 2,
159+
function_to_optimize = "DAISIE",
159160
relaxed_par = "cladogenesis",
160161
par_sd = 0,
161-
par_upper_bound = Inf
162+
par_upper_bound = Inf,
163+
integration_method = "standard"
162164
)
163165
)
164166
expect_equal(model_arguments, expected_arguments)
@@ -186,9 +188,11 @@ test_that("setup_model is correct for rr_lac_dd", {
186188
),
187189
cs_version = list(
188190
model = 2,
191+
function_to_optimize = "DAISIE",
189192
relaxed_par = "cladogenesis",
190193
par_sd = 0,
191-
par_upper_bound = Inf
194+
par_upper_bound = Inf,
195+
integration_method = "standard"
192196
)
193197
)
194198
expect_equal(model_arguments, expected_arguments)
@@ -216,9 +220,11 @@ test_that("setup_model is correct for rr_mu_dd", {
216220
),
217221
cs_version = list(
218222
model = 2,
223+
function_to_optimize = "DAISIE",
219224
relaxed_par = "extinction",
220225
par_sd = 0,
221-
par_upper_bound = Inf
226+
par_upper_bound = Inf,
227+
integration_method = "standard"
222228
)
223229
)
224230
expect_equal(model_arguments, expected_arguments)
@@ -245,9 +251,11 @@ test_that("setup_model is correct for rr_mu_di", {
245251
),
246252
cs_version = list(
247253
model = 2,
254+
function_to_optimize = "DAISIE",
248255
relaxed_par = "extinction",
249256
par_sd = 0,
250-
par_upper_bound = Inf
257+
par_upper_bound = Inf,
258+
integration_method = "standard"
251259
)
252260
)
253261
expect_equal(model_arguments, expected_arguments)
@@ -275,9 +283,11 @@ test_that("setup_model is correct for rr_k", {
275283
),
276284
cs_version = list(
277285
model = 2,
286+
function_to_optimize = "DAISIE",
278287
relaxed_par = "carrying_capacity",
279288
par_sd = 0,
280-
par_upper_bound = Inf
289+
par_upper_bound = Inf,
290+
integration_method = "standard"
281291
)
282292
)
283293
expect_equal(model_arguments, expected_arguments)
@@ -305,9 +315,11 @@ test_that("setup_model is correct for rr_laa_dd", {
305315
),
306316
cs_version = list(
307317
model = 2,
318+
function_to_optimize = "DAISIE",
308319
relaxed_par = "anagenesis",
309320
par_sd = 0,
310-
par_upper_bound = Inf
321+
par_upper_bound = Inf,
322+
integration_method = "standard"
311323
)
312324
)
313325
expect_equal(model_arguments, expected_arguments)

0 commit comments

Comments
 (0)