Skip to content

Commit 9be28e2

Browse files
correct misspelling of NNTAR
1 parent 95e24ef commit 9be28e2

4 files changed

Lines changed: 13 additions & 9 deletions

File tree

DESCRIPTION

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Description: Tools for undertaking time series analysis of mental health
1111
the serious package has been made available as part of the process of
1212
testing and documenting the package. If you have any questions,
1313
please contact the authors (matthew.hamilton1@monash.edu).
14-
License: GPL-3 + file LICENSE
14+
License: GPL-3
1515
URL: https://ready4-dev.github.io/serious/,
1616
https://github.com/ready4-dev/serious,
1717
https://ready4-dev.github.io/ready4/
@@ -21,6 +21,7 @@ RoxygenNote: 7.3.2
2121
Suggests:
2222
knitr,
2323
knitrBootstrap,
24+
pkgload,
2425
rmarkdown,
2526
testthat
2627
VignetteBuilder: knitr

R/fn_make.R

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1548,7 +1548,7 @@ make_training_ds <- function (data_tsb, index_1L_chr = "Date", test_1L_int = int
15481548
#' @param key_totals_ls Key totals (a list), Default: NULL
15491549
#' @param metrics_chr Metrics (a character vector), Default: make_metric_vars()
15501550
#' @param models_chr Models (a character vector), Default: c("Mean", "Naïve", "Seasonal naïve", "Drift", "Trend", "LMTS",
1551-
#' "ETS", "ARIMA", "NNTEAR", "Prophet", "Reg_ARIMA", "Reg_Prophet",
1551+
#' "ETS", "ARIMA", "NENTAR", "Prophet", "Reg_ARIMA", "Reg_Prophet",
15521552
#' "Reg_TSLM")
15531553
#' @param model_type_1L_chr Model type (a character vector of length one), Default: 'multiplicative'
15541554
#' @param order_1L_int Order (an integer vector of length one), Default: 2
@@ -1575,7 +1575,7 @@ make_ts_models <- function (data_xx, approximation_xx = NULL, collapse_1L_lgl =
15751575
"yearly"), index_1L_chr = character(0), join_to_args_ls = make_tfmn_args_ls(),
15761576
key_vars_chr = character(0), key_totals_ls = NULL, metrics_chr = make_metric_vars(),
15771577
models_chr = c("Mean", "Naïve", "Seasonal naïve", "Drift",
1578-
"Trend", "LMTS", "ETS", "ARIMA", "NNTEAR", "Prophet",
1578+
"Trend", "LMTS", "ETS", "ARIMA", "NENTAR", "Prophet",
15791579
"Reg_ARIMA", "Reg_Prophet", "Reg_TSLM"), model_type_1L_chr = "multiplicative",
15801580
order_1L_int = 2, period_1L_int = 12, predictors_chr = character(0),
15811581
prefix_1L_chr = "Cumulative", stepwise_1L_lgl = TRUE, terms_1L_chr = character(0),
@@ -1634,8 +1634,8 @@ make_ts_models <- function (data_xx, approximation_xx = NULL, collapse_1L_lgl =
16341634
LMTS = fable::TSLM(!!rlang::sym(.x) ~ trend() +
16351635
season()), ETS = fable::ETS(!!rlang::sym(.x)),
16361636
ARIMA = fable::ARIMA(!!rlang::sym(.x), approximation = approximation_xx,
1637-
stepwise = stepwise_1L_lgl), NNTEAR = fable::NNETAR(!!rlang::sym(.x)),
1638-
Prophet = eval(parse(text = paste0("fable.prophet::prophet(",
1637+
stepwise = stepwise_1L_lgl), NNETAR = fable::NNETAR(!!rlang::sym(.x)),
1638+
NNTEAR = fable::NNETAR(!!rlang::sym(.x)), Prophet = eval(parse(text = paste0("fable.prophet::prophet(",
16391639
.x, "~season(period=", period_1L_int, ", type='",
16401640
model_type_1L_chr, "', order=", order_1L_int,
16411641
"))"))))

data-raw/fns/make.R

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1057,7 +1057,9 @@ make_ts_models <- function (data_xx, approximation_xx = NULL, collapse_1L_lgl =
10571057
"yearly"), index_1L_chr = character(0), join_to_args_ls = make_tfmn_args_ls(), key_vars_chr = character(0),
10581058
key_totals_ls = NULL, metrics_chr = make_metric_vars(), models_chr = c("Mean",
10591059
"Naïve", "Seasonal naïve", "Drift", "Trend", "LMTS",
1060-
"ETS", "ARIMA", "NNTEAR", "Prophet", "Reg_ARIMA", "Reg_Prophet","Reg_TSLM"),
1060+
"ETS", "ARIMA", "NENTAR",
1061+
# "NNTEAR",
1062+
"Prophet", "Reg_ARIMA", "Reg_Prophet","Reg_TSLM"),
10611063
model_type_1L_chr = "multiplicative", order_1L_int = 2, period_1L_int = 12, predictors_chr = character(0), prefix_1L_chr = "Cumulative",
10621064
stepwise_1L_lgl = TRUE, terms_1L_chr = character(0), terms_ls = NULL, test_1L_int = integer(0),
10631065
type_1L_chr = c("totals", "key"), what_1L_chr = character(0)) {
@@ -1119,7 +1121,8 @@ make_ts_models <- function (data_xx, approximation_xx = NULL, collapse_1L_lgl =
11191121
LMTS = fable::TSLM(!!rlang::sym(.x) ~ trend() + season()),
11201122
ETS = fable::ETS(!!rlang::sym(.x)), ARIMA = fable::ARIMA(!!rlang::sym(.x),
11211123
approximation = approximation_xx, stepwise = stepwise_1L_lgl),
1122-
NNTEAR = fable::NNETAR(!!rlang::sym(.x)),
1124+
NNETAR = fable::NNETAR(!!rlang::sym(.x)),
1125+
NNTEAR = fable::NNETAR(!!rlang::sym(.x)), # Purely for legacy reasons
11231126
Prophet = eval(parse(text = paste0("fable.prophet::prophet(",
11241127
.x, "~season(period=", period_1L_int, ", type='",
11251128
model_type_1L_chr, "', order=", order_1L_int,

man/make_ts_models.Rd

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

0 commit comments

Comments
 (0)