Merge pull request #38 from TanguyBarthelemy/develop

Update rjdemetra --> rjdverse and rjdemetra3 --> rjd3workspace

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

R/deprecated.R

@@ -2,53 +2,53 @@
 #'
 #'
 #' @param jmp,idx,jws,name Parameters.
-#' @name deprecated-rjdemetra3
+#' @name deprecated-rjd3workspace
 #' @export
 .jmp_sa_count<-function(jmp){
   .Deprecated(".jsap_sa_count")
   .jsap_sa_count(jmp)
 }
 
 
-#' @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")

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")

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)

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)

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")

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).

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).