Skip to content

Commit

Permalink
Merge commit 'ed9e9857bd4c204bd02f6427d0b800fa829617ba' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
palatej committed May 8, 2024
2 parents 82cf295 + ed9e985 commit 7193011
Show file tree
Hide file tree
Showing 8 changed files with 656 additions and 22 deletions.
17 changes: 8 additions & 9 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,28 +1,27 @@
Package: rjd3sts
Type: Package
Title: State Space Framework and Structural Time Series with 'JDemetra+ 3.0'
Title: State Space Framework and Structural Time Series with 'JDemetra+ 3.x'
Version: 2.1.1
Authors@R: c(
person("Jean", "Palate", role = c("aut", "cre"),
email = "jean.palate@nbb.be"))
Description: Interface around 'JDemetra+ 3.x' (<https://github.com/jdemetra/jdemetra-core>) seasonal adjustment software, STACE project.
It offers access to several functions around state space modelss and structural time series.
email = "palatejean@gmail.com"))
Description: R Interface to 'JDemetra+ 3.x' (<https://github.com/jdemetra>) time series analysis software.
It offers access to several functions on state space models and structural time series.
Depends:
R (>= 3.6.0)
R (>= 4.1.0)
Imports:
rJava (>= 1.0-6),
RProtoBuf (>= 0.4.17),
rjd3toolkit (>= 3.2.2),
methods
Remotes:
github::rjdemetra/rjd3toolkit
github::rjdverse/rjd3toolkit
SystemRequirements: Java (>= 17)
License: EUPL
URL: https://github.com/palatej/rjd3sts,
https://rjdemetra.github.io/rjd3sts/
URL: https://github.com/rjdverse/rjd3sts, https://rjdverse.github.io/rjd3sts
LazyData: TRUE
RoxygenNote: 7.3.1
BugReports: https://github.com/palatej/rjd3sts/issues
BugReports: https://github.com/rjdverse/rjd3sts
Roxygen: list(markdown = TRUE)
Encoding: UTF-8
Collate:
Expand Down
4 changes: 2 additions & 2 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

[Unreleased]: https://github.com/rjdemetra/rjd3sts/compare/v2.0.0...HEAD
[Unreleased]: https://github.com/rjdverse/rjd3sts/compare/v2.0.0...HEAD

## [2.0.0] - 2023-12-12

[2.0.0]: https://github.com/rjdemetra/rjd3sts/releases/tag/v2.0.0
[2.0.0]: https://github.com/rjdverse/rjd3sts/releases/tag/v2.0.0
2 changes: 1 addition & 1 deletion R/jd3_ssf.R
Original file line number Diff line number Diff line change
Expand Up @@ -727,7 +727,7 @@ cumul<-function(name, core, period, start=0){
#'
#' @examples
aggregation<-function(name, components){
if(!is.list(components) || length(components)<2 ) {
if (!is.list(components) || length(components)<2 ) {
stop("incorrect argument, components should be a list of at least 2 items")}
plist<-list()
for (i in 1:length(components)){
Expand Down
2 changes: 1 addition & 1 deletion R/zzz.R
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
NULL

.onLoad <- function(libname, pkgname) {
if (! requireNamespace('rjd3toolkit', quietly = TRUE)) stop("Loading rjd3 libraries failed")
if (!requireNamespace('rjd3toolkit', quietly = TRUE)) stop("Loading rjd3 libraries failed")

result <- rJava::.jpackage(pkgname, lib.loc=libname)
if (!result) stop("Loading java packages failed")
Expand Down
10 changes: 6 additions & 4 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,21 @@ knitr::opts_chunk$set(

## Installation

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}
# install.packages("remotes")
remotes::install_github("rjdemetra/rjd3toolkit@*release")
remotes::install_github("rjdemetra/rjd3sts@*release")
remotes::install_github("rjdverse/rjd3toolkit@*release")
remotes::install_github("rjdverse/rjd3sts@*release")
```

To get the current development version from GitHub:

```{r, eval = FALSE}
# install.packages("remotes")
remotes::install_github("rjdemetra/rjd3sts")
remotes::install_github("rjdverse/rjd3sts")
```
## Usage

Expand Down Expand Up @@ -63,4 +65,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).
Loading

0 comments on commit 7193011

Please sign in to comment.