diff --git a/NEWS.md b/NEWS.md index 7732bd4..5226247 100644 --- a/NEWS.md +++ b/NEWS.md @@ -9,5 +9,5 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [3.2.2] - 2024-03-15 -[Unreleased]: https://github.com/rjdemetra/rjdemetra3/compare/v3.2.2...HEAD -[3.2.2]: https://github.com/rjdemetra/rjdemetra3/releases/tag/v3.2.2 +[Unreleased]: https://github.com/rjdverse/rjd3workspace/compare/v3.2.2...HEAD +[3.2.2]: https://github.com/rjdverse/rjd3workspace/releases/tag/v3.2.2 diff --git a/R/deprecated.R b/R/deprecated.R index d63ff5e..7050e96 100644 --- a/R/deprecated.R +++ b/R/deprecated.R @@ -2,7 +2,7 @@ #' #' #' @param jmp,idx,jws,name Parameters. -#' @name deprecated-rjdemetra3 +#' @name deprecated-rjd3workspace #' @export .jmp_sa_count<-function(jmp){ .Deprecated(".jsap_sa_count") @@ -10,45 +10,45 @@ } -#' @name deprecated-rjdemetra3 +#' @name deprecated-rjd3workspace #' @export .jmp_name<-function(jmp){ .Deprecated(".jsap_name") .jsap_name(jmp) } -#' @name deprecated-rjdemetra3 +#' @name deprecated-rjd3workspace #' @export .jmp_sa<-function(jmp, idx){ .Deprecated(".jsap_sa") .jsap_sa(jmp, idx) } -#' @name deprecated-rjdemetra3 +#' @name deprecated-rjd3workspace #' @export .jmp_sa_name <- function(jmp) { .Deprecated(".jsap_sa_name") .jsap_sa_name(jmp) } -#' @name deprecated-rjdemetra3 +#' @name deprecated-rjd3workspace #' @export .jmp_load<-function(jmp){ .Deprecated("read_sap") read_sap(jmp) } -#' @name deprecated-rjdemetra3 +#' @name deprecated-rjd3workspace #' @export .jws_multiprocessing<-function(jws, idx){ .Deprecated(".jws_sap") .jws_sap(jws, idx) } -#' @name deprecated-rjdemetra3 +#' @name deprecated-rjd3workspace #' @export .jws_multiprocessing_new<-function(jws, name){ .Deprecated(".jws_sap_new") .jws_sap_new(jws, name) } -#' @name deprecated-rjdemetra3 +#' @name deprecated-rjd3workspace #' @export .jws_multiprocessing_count<-function(jws){ .Deprecated(".jws_sap_count") diff --git a/R/saitem.R b/R/saitem.R index 83874ef..485a79c 100644 --- a/R/saitem.R +++ b/R/saitem.R @@ -20,7 +20,7 @@ NULL #' - `results`: the result of the model. #' @export .jsa_read<-function(jsa){ -# if(! .jcall(jsa, "Z", "isProcessed")) +# if (! .jcall(jsa, "Z", "isProcessed")) # stop("You must run '.jws_compute()' on your workspace.") jdef<-.jcall(jsa, "Ljdplus/sa/base/api/SaDefinition;", "getDefinition") diff --git a/R/saprocessing.R b/R/saprocessing.R index 706f371..a7a370e 100644 --- a/R/saprocessing.R +++ b/R/saprocessing.R @@ -416,7 +416,7 @@ set_name <- function(jsap, idx, name) { #' @export #' @examples #' # Change the file of a given item -#' file <- system.file("workspaces", "test.xml", package = "rjdemetra3") +#' file <- system.file("workspaces", "test.xml", package = "rjd3workspace") #' jws <- .jws_load(file) #' jsap <- .jws_sap(jws, 1) #' jsa <- .jsap_sa(jsap, 1) diff --git a/R/workspace.R b/R/workspace.R index 1a4fc23..85ef0ea 100644 --- a/R/workspace.R +++ b/R/workspace.R @@ -199,7 +199,7 @@ get_context<-function(jws){ #' #' @export #' @examples -#' file<-system.file("workspaces", "test.xml", package = "rjdemetra3") +#' file<-system.file("workspaces", "test.xml", package = "rjd3workspace") #' jws<-.jws_load(file) #' # We don't compute the workspace #' rws<-read_workspace(jws, FALSE) diff --git a/R/zzz.R b/R/zzz.R index c8117a5..20be472 100644 --- a/R/zzz.R +++ b/R/zzz.R @@ -3,9 +3,9 @@ NULL .onLoad <- function(libname, pkgname) { - if (! requireNamespace("rjd3tramoseats", quietly = TRUE)) stop("Loading rjd3 libraries failed") - if (! requireNamespace("rjd3x13", quietly = TRUE)) stop("Loading rjd3 libraries failed") - if (! requireNamespace("rjd3providers", quietly = TRUE)) stop("Loading rjd3 libraries failed") + if (!requireNamespace("rjd3tramoseats", quietly = TRUE)) stop("Loading rjd3 libraries failed") + if (!requireNamespace("rjd3x13", quietly = TRUE)) stop("Loading rjd3 libraries failed") + if (!requireNamespace("rjd3providers", quietly = TRUE)) stop("Loading rjd3 libraries failed") result <- rJava::.jpackage(pkgname, lib.loc=libname) if (!result) stop("Loading java packages failed") diff --git a/README.Rmd b/README.Rmd index 40073e3..4f9a457 100644 --- a/README.Rmd +++ b/README.Rmd @@ -18,6 +18,7 @@ library("rjd3workspace") **rjd3workspace** offers several functions to wrangle JDemetra+ v3.x workspaces. + Seasonal adjustment with X-12ARIMA can be done with the package [**rjd3x13**](https://github.com/rjdverse/rjd3x13) and with TRAMO-SEATS with the package [**rjd3tramoseats**](https://github.com/rjdverse/rjd3tramoseats). @@ -27,7 +28,6 @@ Seasonal adjustment with X-12ARIMA can be done with the package [**rjd3x13**](ht Running rjd3 packages requires **Java 17 or higher**. How to set up such a configuration in R is explained [here](https://jdemetra-new-documentation.netlify.app/#Rconfig) - To get the current stable version (from the latest release): ```{r, eval = FALSE} @@ -108,4 +108,4 @@ pull requests should include **updated tests** and **updated documentation**. If ## Licensing -The code of this project is licensed under the [European Union Public Licence (EUPL)](https://joinup.ec.europa.eu/page/eupl-text-11-12). +The code of this project is licensed under the [European Union Public Licence (EUPL)](https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12). diff --git a/README.md b/README.md index 10cc794..3c51448 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,11 @@ # rjd3workspace **rjd3workspace** offers several functions to wrangle JDemetra+ v3.x -workspaces. Seasonal adjustment with X-12ARIMA can be done with the -package [**rjd3x13**](https://github.com/rjdverse/rjd3x13) and with -TRAMO-SEATS with the package +workspaces. + +Seasonal adjustment with X-12ARIMA can be done with the package +[**rjd3x13**](https://github.com/rjdverse/rjd3x13) and with TRAMO-SEATS +with the package [**rjd3tramoseats**](https://github.com/rjdverse/rjd3tramoseats). ## Installation @@ -99,4 +101,5 @@ should be added or updated. ## Licensing The code of this project is licensed under the [European Union Public -Licence (EUPL)](https://joinup.ec.europa.eu/page/eupl-text-11-12). +Licence +(EUPL)](https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12). diff --git a/man/deprecated-rjdemetra3.Rd b/man/deprecated-rjdemetra3.Rd index cf6248c..85864c0 100644 --- a/man/deprecated-rjdemetra3.Rd +++ b/man/deprecated-rjdemetra3.Rd @@ -1,7 +1,7 @@ % Generated by roxygen2: do not edit by hand % Please edit documentation in R/deprecated.R -\name{deprecated-rjdemetra3} -\alias{deprecated-rjdemetra3} +\name{deprecated-rjd3workspace} +\alias{deprecated-rjd3workspace} \alias{.jmp_sa_count} \alias{.jmp_name} \alias{.jmp_sa} diff --git a/man/read_workspace.Rd b/man/read_workspace.Rd index e42341c..7326fe6 100644 --- a/man/read_workspace.Rd +++ b/man/read_workspace.Rd @@ -21,7 +21,7 @@ Functions to read all the SAItem of a SAProcessing (\code{read_sap()}) or a workspace (\code{read_workspace()}). } \examples{ -file<-system.file("workspaces", "test.xml", package = "rjdemetra3") +file<-system.file("workspaces", "test.xml", package = "rjd3workspace") jws<-.jws_load(file) # We don't compute the workspace rws<-read_workspace(jws, FALSE) diff --git a/man/set_ts_metadata.Rd b/man/set_ts_metadata.Rd index 82ac09b..cc3b949 100644 --- a/man/set_ts_metadata.Rd +++ b/man/set_ts_metadata.Rd @@ -27,7 +27,7 @@ allows to update a specific key with a new information. } \examples{ # Change the file of a given item -file <- system.file("workspaces", "test.xml", package = "rjdemetra3") +file <- system.file("workspaces", "test.xml", package = "rjd3workspace") jws <- .jws_load(file) jsap <- .jws_sap(jws, 1) jsa <- .jsap_sa(jsap, 1) diff --git a/RJDemetra3.Rproj b/rjd3workspace.Rproj similarity index 100% rename from RJDemetra3.Rproj rename to rjd3workspace.Rproj