Skip to content

Commit 352a42d

Browse files
authored
Merge pull request #179 from mrc-ide/upgrade-odin
Regenerate with newer odin
2 parents 15f6d11 + 8df08c3 commit 352a42d

File tree

7 files changed

+778
-773
lines changed

7 files changed

+778
-773
lines changed

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: squire
22
Type: Package
33
Title: SEIR transmission model of COVID-19
4-
Version: 0.7.0
4+
Version: 0.7.1
55
Authors@R: c(
66
person("OJ", "Watson", email = "o.watson15@imperial.ac.uk", role = c("aut", "cre")),
77
person("Patrick", "Walker", email = "patrick.walker06@imperial.ac.uk", role = c("aut")),
@@ -26,7 +26,7 @@ Suggests:
2626
mockery
2727
RoxygenNote: 7.1.2
2828
Imports:
29-
odin (>= 1.1.0),
29+
odin (>= 1.2.4),
3030
dde (>= 1.0.2),
3131
dplyr,
3232
tidyr,

R/odin.R

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Automatically generated by odin 1.1.6 - do not edit
1+
## Automatically generated by odin 1.2.4 - do not edit
22
explicit_SEIR_deterministic_ <- R6::R6Class(
33
"odin_model",
44
cloneable = FALSE,
@@ -131,6 +131,7 @@ explicit_SEIR_deterministic_ <- R6::R6Class(
131131

132132
explicit_SEIR_deterministic <- function(..., user = list(...), use_dde = FALSE,
133133
unused_user_action = NULL) {
134+
asNamespace("odin")$deprecated_constructor_call("explicit_SEIR_deterministic")
134135
explicit_SEIR_deterministic_$new(user = user, use_dde = use_dde,
135136
unused_user_action = unused_user_action)
136137
}
@@ -261,6 +262,7 @@ explicit_SEIR_ <- R6::R6Class(
261262

262263
explicit_SEIR <- function(..., user = list(...), use_dde = FALSE,
263264
unused_user_action = NULL) {
265+
asNamespace("odin")$deprecated_constructor_call("explicit_SEIR")
264266
explicit_SEIR_$new(user = user, use_dde = use_dde,
265267
unused_user_action = unused_user_action)
266268
}
@@ -379,6 +381,7 @@ less_basic_model_for_js_ <- R6::R6Class(
379381

380382
less_basic_model_for_js <- function(..., user = list(...), use_dde = FALSE,
381383
unused_user_action = NULL) {
384+
asNamespace("odin")$deprecated_constructor_call("less_basic_model_for_js")
382385
less_basic_model_for_js_$new(user = user, use_dde = use_dde,
383386
unused_user_action = unused_user_action)
384387
}
@@ -492,6 +495,7 @@ simple_SEIR_ <- R6::R6Class(
492495

493496
simple_SEIR <- function(..., user = list(...), use_dde = FALSE,
494497
unused_user_action = NULL) {
498+
asNamespace("odin")$deprecated_constructor_call("simple_SEIR")
495499
simple_SEIR_$new(user = user, use_dde = use_dde,
496500
unused_user_action = unused_user_action)
497501
}

inst/odin/explicit_SEIR.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

inst/odin/explicit_SEIR_deterministic.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

inst/odin/less_basic_model_for_js.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

inst/odin/simple_SEIR.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)