Merge pull request #139 from jdemetra/develop

v0.2.6

.github/workflows/pkgdown.yaml

@@ -44,3 +44,4 @@ jobs:
           clean: false
           branch: gh-pages
           folder: docs
+          single-commit: true

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: RJDemetra
 Type: Package
 Title: Interface to 'JDemetra+' Seasonal Adjustment Software
-Version: 0.2.5
+Version: 0.2.6
 Authors@R: c(
   person("Alain", "Quartier-la-Tente", role = c("aut", "cre"),
                  email = "[email protected]",
@@ -27,11 +27,11 @@ Imports:
     utils
 SystemRequirements: Java (>= 8)
 License: EUPL
-URL: https://jdemetra.github.io/rjdemetra/, https://github.com/jdemetra/rjdemetra
 LazyData: TRUE
 Suggests:
     knitr,
     rmarkdown
+URL: https://jdemetra.github.io/rjdemetra/, https://github.com/jdemetra/rjdemetra
 BugReports: https://github.com/jdemetra/rjdemetra/issues
 Encoding: UTF-8
 RoxygenNote: 7.3.1

NEWS.md

@@ -1,7 +1,20 @@
+# RJDemetra 0.2.6
+
+- possibility to export last msr for monthly data (issue #122).
+
+- possibility to export X-11 some components: `y_cmp`, `y_cmp_f`, `t_cmp`, `t_cmp_f`, `sa_cmp`, `s_cmp`, `s_cmp_f`, and `i_cmp`.
+
+- correction when importing models containing ramp regressors when the frequency is not 12 (monthly).
+
+- correction of `get_jmodel()` with empty multiprocessings.
+
+
 # RJDemetra 0.2.5
 
 - `proc_data()` update to export more data from Java object.
 
+- seasonality Kurskal-Wallis test corrected (issue #128).
+
 - `vcov()` correction when matrix NULL and new parameter `component`.
 
 - some corrections in `print()` methods.

R/get_jmodel.R

@@ -13,7 +13,7 @@ get_jmodel.workspace <- function(x, workspace,
   multiprocessings <- get_all_objects(x)
   nb_mp <- length(multiprocessings)
 
-  result <- lapply(1:nb_mp, function(i){
+  result <- lapply(seq_len(nb_mp), function(i){
     if (progress_bar)
       cat(sprintf("Multiprocessing %i on %i:\n", i, nb_mp))
     get_jmodel(multiprocessings[[i]],
@@ -34,7 +34,7 @@ get_jmodel.multiprocessing <- function(x, workspace,
   if (progress_bar)
     pb <- txtProgressBar(min = 0, max = nb_sa_objs, style = 3)
 
-  result <- lapply(1:nb_sa_objs, function(i){
+  result <- lapply(seq_len(nb_sa_objs), function(i){
     res <- get_jmodel(all_sa_objects[[i]],
                      workspace = workspace, userdefined = userdefined)
     if (progress_bar)

R/utils.R

@@ -8,10 +8,18 @@ identical_na <- function(x){
 }
 
 
-ramp <- function(start = 1990, end = 2020,
+ramp <- function(start = 1900, end = 2100,
                  start_ramp, end_ramp, frequency = 12){
   start <- format_ts_date(start, frequency)
   end <- format_ts_date(end, frequency)
+  # start_ramp and end_ramp are defined in month and not in the frequency of the model
+  new_period <-  rep(seq.int(from = 1, to = frequency), each = 12 / frequency)
+  if (length(start_ramp) == 2) {
+    start_ramp[2] <- new_period[start_ramp[2]]
+  }
+  if (length(end_ramp) == 2) {
+    end_ramp[2] <- new_period[end_ramp[2]]
+  }
   start_ramp <- format_ts_date(start_ramp, frequency)
   end_ramp <- format_ts_date(end_ramp, frequency)
 
@@ -20,7 +28,7 @@ ramp <- function(start = 1990, end = 2020,
   if (missing(start) || missing(end)) {
     # if start and end not specified by hand
     start <- min(start_ramp - 1, start)
-    end <- min(end_ramp + 1, end)
+    end <- max(end_ramp + 1, end)
   }
 
   x <- ts(-1, start = start, end = end,

README.Rmd

@@ -24,7 +24,7 @@ options(enable_print_style = FALSE)
 [![CRAN downloads](http://cranlogs.r-pkg.org/badges/grand-total/RJDemetra?color=lightgrey)](https://cran.r-project.org/package=RJDemetra)
 [![Mentioned in Awesome Official Statistics ](https://awesome.re/mentioned-badge.svg)](https://github.com/SNStatComp/awesome-official-statistics-software)
 
-RJDemetra is an R interface to JDemetra+, the seasonal adjustment software officially recommended to the members of the European Statistical System (ESS) and the European System of Central Banks. JDemetra+ implements the two leading seasonal adjustment methods [TRAMO/SEATS+](https://gretl.sourceforge.net/tramo/tramo-seats.html) and [X-12ARIMA/X-13ARIMA-SEATS](https://www.census.gov/data/software/x13as.html).
+RJDemetra is an R interface to JDemetra+, the seasonal adjustment software [officially recommended](https://wayback.archive-it.org/12090/20240102173448/https://cros-legacy.ec.europa.eu/system/files/Jdemetra_%20release.pdf) to the members of the European Statistical System (ESS) and the European System of Central Banks. JDemetra+ implements the two leading seasonal adjustment methods [TRAMO/SEATS+](https://gretl.sourceforge.net/tramo/tramo-seats.html) and [X-12ARIMA/X-13ARIMA-SEATS](https://www.census.gov/data/software/x13as.html).
 
 
 Besides seasonal adjustment, JDemetra+ bundles other time series models that are useful in the production or analysis of economic statistics, including for instance outlier detection, nowcasting, temporal disaggregation or benchmarking.

README.md

@@ -15,9 +15,11 @@ downloads](http://cranlogs.r-pkg.org/badges/grand-total/RJDemetra?color=lightgre
 Statistics](https://awesome.re/mentioned-badge.svg)](https://github.com/SNStatComp/awesome-official-statistics-software)
 
 RJDemetra is an R interface to JDemetra+, the seasonal adjustment
-software officially recommended to the members of the European
-Statistical System (ESS) and the European System of Central Banks.
-JDemetra+ implements the two leading seasonal adjustment methods
+software [officially
+recommended](https://wayback.archive-it.org/12090/20240102173448/https://cros-legacy.ec.europa.eu/system/files/Jdemetra_%20release.pdf)
+to the members of the European Statistical System (ESS) and the European
+System of Central Banks. JDemetra+ implements the two leading seasonal
+adjustment methods
 [TRAMO/SEATS+](https://gretl.sourceforge.net/tramo/tramo-seats.html) and
 [X-12ARIMA/X-13ARIMA-SEATS](https://www.census.gov/data/software/x13as.html).