Skip to content

Commit c864101

Browse files
committed
new policies
1 parent 4509c01 commit c864101

File tree

7 files changed

+30
-24
lines changed

7 files changed

+30
-24
lines changed

NEWS.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
- parameter `file_param` added in `create_param_file()` and `list2param_file()` to be able to change the name of the parameter file.
88

9+
- documentation update to add new policies.
10+
911
# rjwsacruncher 0.2.0
1012

1113
- correction in export of the log file when relative path are given.

R/param_file.R

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#' \item \code{policy = "current"}: all the estimations are fixed and AO added for new data (since v.2.2.3), short name `policy = "n"`;
2626
#' \item \code{policy = "fixed"}: all the estimations are fixed (since v.2.2.3), short name `policy = "f"`;
2727
#' \item \code{policy = "fixedparameters"}: re-estimation of the coefficients of the regression variables (but not the ARIMA coefficients), short name `policy = "fp"`;
28+
#' \item \code{policy = "fixedarparameters"}: re-estimation of the coefficients of the regression variables and of the MA coefficients of the ARIMA model (but not the AR coefficients), short name `policy = "farp"` (since v.3.3.1);
2829
#' \item \code{policy = "parameters"} (the default): \code{policy = "fixedparameters"} + re-estimation of ARIMA coefficients, short name `policy = "p"`;
2930
#' \item \code{policy = "lastoutliers"}: \code{policy = "parameters"} + re-identification of last outliers (on the last year), short name `policy = "l"`;
3031
#' \item \code{policy = "outliers"}: \code{policy = "lastoutliers"} + re-identification of all outliers, short name `policy = "o"`;

README.Rmd

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,15 @@ The goal of rjwsacruncher is to launch quickly and easily the [JWSACruncher](htt
3131
# Install release version from CRAN
3232
install.packages("rjwsacruncher")
3333
34-
# Install development version from GitHub
34+
# Install development version:
35+
install.packages("rjwsacruncher", repos = c("https://aqlt.r-universe.dev", "https://cloud.r-project.org"))
36+
# Or :
3537
# install.packages("devtools")
36-
devtools::install_github("AQLT/rjwsacruncher")
38+
# devtools::install_github("AQLT/rjwsacruncher")
3739
```
3840

39-
The JWSACruncher is not included in the package. It can be downloaded from GitHub (<https://github.com/jdemetra/jwsacruncher/releases>) or with the function `download_cruncher()`:
41+
The JWSACruncher is not included in the package.
42+
It can be downloaded from GitHub (<https://github.com/jdemetra/jwsacruncher/releases> or <https://github.com/jdemetra/jdplus-main/releases>) or with the function `download_cruncher()`:
4043

4144
```{r, eval = FALSE}
4245
library(rjwsacruncher)

README.md

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,17 @@ JWSACruncher can be found on
2626
# Install release version from CRAN
2727
install.packages("rjwsacruncher")
2828

29-
# Install development version from GitHub
29+
# Install development version:
30+
install.packages("rjwsacruncher", repos = c("https://aqlt.r-universe.dev", "https://cloud.r-project.org"))
31+
# Or :
3032
# install.packages("devtools")
31-
devtools::install_github("AQLT/rjwsacruncher")
33+
# devtools::install_github("AQLT/rjwsacruncher")
3234
```
3335

3436
The JWSACruncher is not included in the package. It can be downloaded
35-
from GitHub (<https://github.com/jdemetra/jwsacruncher/releases>) or
36-
with the function `download_cruncher()`:
37+
from GitHub (<https://github.com/jdemetra/jwsacruncher/releases> or
38+
<https://github.com/jdemetra/jdplus-main/releases>) or with the function
39+
`download_cruncher()`:
3740

3841
``` r
3942
library(rjwsacruncher)
@@ -67,14 +70,8 @@ and “default_tsmatrix_series”:
6770
head(getOption("default_matrix_item"))
6871
#> [1] "period" "span.start" "span.end" "span.n" "span.missing"
6972
#> [6] "espan.start"
70-
```
71-
72-
``` r
7373
getOption("default_tsmatrix_series")
7474
#> [1] "y" "t" "sa" "s" "i" "ycal"
75-
```
76-
77-
``` r
7875
# To only export the seasonally adjusted series and its forecasts:
7976
options(default_tsmatrix_series = c("sa", "sa_f"))
8077
```

man/create_param_file.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.

rjwsacruncher.Rproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
Version: 1.0
2+
ProjectId: 47355459-5488-4634-962b-f72f4a2fe071
23

34
RestoreWorkspace: Default
45
SaveWorkspace: Default

vignettes/run_jwsacruncher.Rmd

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ library(rjwsacruncher)
2121
# Launch the 'JWSACruncher"
2222

2323
To use `rjwsacruncher` you need to download the JWACruncher.
24-
It is available on <https://github.com/jdemetra/jdemetra-app/releases> (for JDemetra+ 2.x.y versions) or <https://github.com/jdemetra/jdemetra-app/releases> (for JDemetra+ 3.x.y versions).
24+
It is available on <https://github.com/jdemetra/jdemetra-app/releases> (for JDemetra+ 2.x.y versions) or <https://github.com/jdemetra/jdplus-main/releases> (for JDemetra+ 3.x.y versions).
2525
It can also be downloaded with the function `download_cruncher()`:
2626
```{r, eval = FALSE}
2727
library(rjwsacruncher)
@@ -56,36 +56,37 @@ The three most important parameters of `create_param_file()` are:
5656
1. `policy` the refresh policy (see table below).
5757

5858
```{r,echo=FALSE}
59-
refresh_policy <- structure(list(`Option on JDemetra+` = c(
59+
refresh_policy <- data.frame(`Option on JDemetra+` = c(
6060
"Current[AO]: fixed model + AO for new data",
6161
"Fixed model",
6262
"Estimate regression coefficients",
63+
"Estimate regression coefficients + MA parameters of the ARIMA model",
6364
"Estimate regression coefficients + Arima parameters",
6465
"Estimate regression coefficients + Last outliers",
6566
"Estimate regression coefficients + all outliers",
6667
"Estimate regression coefficients + Arima model",
6768
"Concurrent"),
6869
`Option for the JWSACruncher` = c(
69-
"current", "fixed", "fixedparameters",
70+
"current", "fixed", "fixedparameters", "fixedarparameters",
7071
"parameters (by default)", "lastoutliers", "outliers",
7172
"stochastic", "complete (or concurrent)"),
7273
`Short name` = c(
73-
"n", "f", "fp", "p", "l", "o", "s", "c"
74+
"n", "f", "fp", "farp", "p", "l", "o", "s", "c"
7475
),
7576
Description = c(
76-
"The ARIMA model, outliers and other regression parameters are not re-identified and the values of all parameters are fixed. The transformation type remains unchanged. An additive outlier (AO) is added for new data",
77-
"The ARIMA model, outliers and other regression parameters are not re-identified and the values of all parameters are fixed. The transformation type remains unchanged.",
77+
"The ARIMA model, outliers and other regression parameters are not re-identified and the values of all parameters are fixed. The transformation type remains unchanged. An additive outlier (AO) is added for new data. (since v.2.2.3)",
78+
"The ARIMA model, outliers and other regression parameters are not re-identified and the values of all parameters are fixed. The transformation type remains unchanged. (since v.2.2.3)",
7879
"The ARIMA model, outliers and other regression parameters are not re-identified. The coefficients of the ARIMA model are fixed, other coefficients are re-estimated. The transformation type remains unchanged.",
80+
"The ARIMA model, outliers and other regression parameters are not re-identified. The AR coefficients of the ARIMA model are fixed, other coefficients are re-estimated (MA coefficients + regressors). The transformation type remains unchanged. (since v.3.3.1)",
7981
"The ARIMA model, outliers and other regression parameters are not re-identified. All parameters of the RegARIMA model are re-estimated. The transformation type remains unchanged.",
8082
"The ARIMA model, outliers (except from the outliers in the last year of the sample) and other regression parameters are not re-identified. All parameters of the RegARIMA model are re-estimated. The outliers in the last year of the sample are re-identified. The transformation type remains unchanged.",
8183
"The ARIMA model and regression parameters, except from outliers) are not re-identified. All parameters of the RegARIMA model are re-estimated. All outliers are re-identified. The transformation type remains unchanged.",
8284
"Re-identification of the ARIMA model, outliers and regression variables, except from the calendar variables. The transformation type remains unchanged.",
83-
"Re-identification of the whole RegARIMA model.")),
84-
.Names = c("Option on JDemetra+",
85-
"Option for the JWSACruncher", "Short name", "Description"),
86-
class = "data.frame", row.names = c(NA, -8L))
85+
"Re-identification of the whole RegARIMA model."),
86+
check.names = FALSE
87+
)
8788
88-
refresh_policy[2:7, 1] <- paste("Partial concurrent adjustment ->", refresh_policy[2:7, 1])
89+
refresh_policy[-c(1, nrow(refresh_policy)), 1] <- paste("Partial concurrent adjustment ->", refresh_policy[-c(1, nrow(refresh_policy)), 1])
8990
kable(refresh_policy, caption = "Refresh policies",
9091
booktabs = TRUE)
9192
```

0 commit comments

Comments
 (0)