Merge pull request #55 from TanguyBarthelemy/develop

Add new .jar files
rjdverse · Jul 12, 2024 · 177d7a7 · 177d7a7
2 parents 772b637 + 13e86f1
commit 177d7a7
Show file tree

Hide file tree

Showing 14 changed files with 39 additions and 10 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -8,6 +8,11 @@ to [Semantic Versioning](https://semver.org/spec/v3.2.3.html).
 
 ## [Unreleased]
 
+### Changed
+
+* New .jar (related to release [3.2.4](https://github.com/jdemetra/jdplus-main/releases/tag/v3.2.4))
+
+
 ## [3.2.3] - 2024-07-12
 
 
@@ -18,7 +23,7 @@ to [Semantic Versioning](https://semver.org/spec/v3.2.3.html).
 ### Changed
 
 * New JARS
-
+* Some linting of R functions
 
 ## [3.2.2] - 2024-03-15 
 

diff --git a/R/calendars.R b/R/calendars.R
@@ -15,12 +15,12 @@ SINGLEDAY<-'JD3_SINGLEDAY'
  vp<-jd3.ValidityPeriod$new()
  if (is.null(start)) {
  pstart<-DATE_MIN
- }else {
+ } else {
  pstart<-parseDate(start)
  }
  if (is.null(end)){
  pend<-DATE_MAX
- }else {
+ } else {
  pend<-parseDate(end)
  }
  vp$start<-pstart
@@ -50,7 +50,7 @@ SINGLEDAY<-'JD3_SINGLEDAY'
 .length_ts <- function(s){
  if (is.mts(s)){
  nrow(s)
- }else {
+ } else {
  length(s)
  }
 }

diff --git a/R/decomposition.R b/R/decomposition.R
@@ -14,14 +14,14 @@ sadecomposition<-function(y, sa, t, s, i, mul){
  if (is.null(s)){
  if (mul){
  s<-ts(rep(1,1,n), start = start(y), frequency = frequency(y))
- }else {
+ } else {
  s <- ts(rep(0,1,n), start = start(y), frequency = frequency(y))
  }
  } else if (! is.ts(s))stop("Invalid SA decomposition")
  if (is.null(i)){
  if (mul){
  i<-ts(rep(1,1,n), start = start(y), frequency = frequency(y))
- }else {
+ } else {
  i<-ts(rep(0,1,n), start = start(y), frequency = frequency(y))
  }
  } else if (! is.ts(i))stop("Invalid SA decomposition")

diff --git a/README.Rmd b/README.Rmd
@@ -26,7 +26,6 @@ knitr::opts_chunk$set(
 <!-- badges: end -->
 
 
-
 Utility package in JDemetra+ 3.x R ecosystem. Contains functions used in other `rjd3` packages and has to be systematically installed before using any other rjd3 package. 
 
 ## Main Functions 
@@ -48,14 +47,26 @@ Utility package in JDemetra+ 3.x R ecosystem. Contains functions used in other `
 
 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)
 
+### Latest release
+
 To get the current stable version (from the latest release):
 
+- From GitHub:
+
 ```{r, echo = TRUE, eval = FALSE}
 # install.packages("remotes")
 remotes::install_github("rjdverse/rjd3toolkit@*release")
 ```
 
-To get the current development version from GitHub:
+- From [r-universe](https://rjdverse.r-universe.dev/rjd3toolkit):
+
+```{r, echo = TRUE, eval = FALSE}
+install.packages("rjd3toolkit", repos = c("https://rjdverse.r-universe.dev", "https://cloud.r-project.org"))
+```
+
+### Development version
+
+You can install the development version of **rjd3toolkit** from [GitHub](https://github.com/) with:
 
 ```{r, echo = TRUE, eval = FALSE}
 # install.packages("remotes")

diff --git a/README.md b/README.md
@@ -39,14 +39,27 @@ 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)
 
+### Latest release
+
 To get the current stable version (from the latest release):
 
+- From GitHub:
+
 ``` r
 # install.packages("remotes")
 remotes::install_github("rjdverse/rjd3toolkit@*release")
 ```
 
-To get the current development version from GitHub:
+- From [r-universe](https://rjdverse.r-universe.dev/rjd3toolkit):
+
+``` r
+install.packages("rjd3toolkit", repos = c("https://rjdverse.r-universe.dev", "https://cloud.r-project.org"))
+```
+
+### Development version
+
+You can install the development version of **rjd3toolkit** from
+[GitHub](https://github.com/) with:
 
 ``` r
 # install.packages("remotes")

diff --git a/...ava/jdplus-sa-base-api-3.2.3-SNAPSHOT.jar → inst/java/jdplus-sa-base-api-3.2.4.jar b/...ava/jdplus-sa-base-api-3.2.3-SNAPSHOT.jar → inst/java/jdplus-sa-base-api-3.2.4.jar
diff --git a/...va/jdplus-sa-base-core-3.2.3-SNAPSHOT.jar → inst/java/jdplus-sa-base-core-3.2.4.jar b/...va/jdplus-sa-base-core-3.2.3-SNAPSHOT.jar → inst/java/jdplus-sa-base-core-3.2.4.jar
diff --git a/...dplus-sa-base-protobuf-3.2.3-SNAPSHOT.jar → inst/java/jdplus-sa-base-protobuf-3.2.4.jar b/...dplus-sa-base-protobuf-3.2.3-SNAPSHOT.jar → inst/java/jdplus-sa-base-protobuf-3.2.4.jar
diff --git a/.../java/jdplus-sa-base-r-3.2.3-SNAPSHOT.jar → inst/java/jdplus-sa-base-r-3.2.4.jar b/.../java/jdplus-sa-base-r-3.2.3-SNAPSHOT.jar → inst/java/jdplus-sa-base-r-3.2.4.jar
diff --git a/...dplus-toolkit-base-api-3.2.3-SNAPSHOT.jar → inst/java/jdplus-toolkit-base-api-3.2.4.jar b/...dplus-toolkit-base-api-3.2.3-SNAPSHOT.jar → inst/java/jdplus-toolkit-base-api-3.2.4.jar
diff --git a/...plus-toolkit-base-core-3.2.3-SNAPSHOT.jar → inst/java/jdplus-toolkit-base-core-3.2.4.jar b/...plus-toolkit-base-core-3.2.3-SNAPSHOT.jar → inst/java/jdplus-toolkit-base-core-3.2.4.jar
diff --git a/...-toolkit-base-protobuf-3.2.3-SNAPSHOT.jar → ...va/jdplus-toolkit-base-protobuf-3.2.4.jar b/...-toolkit-base-protobuf-3.2.3-SNAPSHOT.jar → ...va/jdplus-toolkit-base-protobuf-3.2.4.jar
diff --git a/.../jdplus-toolkit-base-r-3.2.3-SNAPSHOT.jar → inst/java/jdplus-toolkit-base-r-3.2.4.jar b/.../jdplus-toolkit-base-r-3.2.3-SNAPSHOT.jar → inst/java/jdplus-toolkit-base-r-3.2.4.jar
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
  <description>Usage: mvn -Pcopy-jars</description>
 
  <properties>
- <jdplus-main.version>3.2.2</jdplus-main.version>
+ <jdplus-main.version>3.2.4</jdplus-main.version>
  </properties>
 
  <dependencies>