Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New Java libraries + code cleanup #64

Merged
merged 25 commits into from
Oct 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
a32274b
Back to develop branch
TanguyBarthelemy Jul 12, 2024
d811212
lintr trailing whitespace
TanguyBarthelemy Jul 12, 2024
ad4e50d
Merge branch 'develop' of https://github.com/TanguyBarthelemy/rjd3x13…
TanguyBarthelemy Jul 13, 2024
4e61151
update roxygen2
AQLT Jul 24, 2024
98cefd0
simplify print
AQLT Jul 24, 2024
e0a5200
Merge pull request #57 from AQLT/simplify_print
TanguyBarthelemy Aug 19, 2024
eed2690
Merge branch 'rjdverse:develop' into develop
TanguyBarthelemy Aug 29, 2024
21eda7c
Add updated logos
TanguyBarthelemy Aug 29, 2024
e463df1
lintr lengths_linter
TanguyBarthelemy Oct 1, 2024
e572bea
lintr any_is_na_linter
TanguyBarthelemy Oct 1, 2024
78401cb
update lintr with max length line
TanguyBarthelemy Oct 8, 2024
a37f6ba
brace linter
TanguyBarthelemy Oct 14, 2024
b011f16
style package
TanguyBarthelemy Oct 14, 2024
ac85b63
Merge pull request #59 from TanguyBarthelemy/develop
TanguyBarthelemy Oct 14, 2024
70c9a7a
indent package
TanguyBarthelemy Oct 14, 2024
8485342
Merge branch 'rjdverse:develop' into develop
TanguyBarthelemy Oct 14, 2024
d304c87
Merge pull request #60 from TanguyBarthelemy/develop
TanguyBarthelemy Oct 14, 2024
e4cb5ff
some statistics on decomposition by default in print
AQLT Oct 23, 2024
8ccc3b5
simplify print
AQLT Oct 23, 2024
cca787a
thresholds as option
AQLT Oct 23, 2024
a0e23c7
Merge pull request #62 from AQLT/develop
TanguyBarthelemy Oct 25, 2024
5eb2721
Upgrade to 3.3.0 (new Jva libraries)
Oct 28, 2024
16c83b6
Disable lintr
Oct 28, 2024
2880cfe
Linting of some functions
Oct 28, 2024
18a0db5
Merge pull request #63 from palatej/develop
palatej Oct 28, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions .lintr
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
linters: linters_with_defaults(
indentation_linter = lintr::indentation_linter(indent = 4L),
linters: lintr::all_linters(
#indentation_linter = lintr::indentation_linter(indent = 4L),
indentation_linter = NULL,
assignment_linter = NULL,
# line_length_linter = lintr::line_length_linter(80L),
line_length_linter = lintr::line_length_linter(200L),
trailing_blank_lines_linter = NULL,
trailing_whitespace_linter = NULL,
assignment_linter = NULL,
whitespace_linter = NULL,
brace_linter = NULL,
infix_spaces_linter = NULL,
paren_body_linter = NULL,
indentation_linter = NULL,
function_left_parentheses_linter = NULL,
spaces_left_parentheses_linter = NULL,
commas_linter = NULL,
Expand All @@ -21,7 +22,15 @@ linters: linters_with_defaults(
cyclocomp_linter = NULL,
object_usage_linter = NULL,
object_name_linter = NULL,
line_length_linter = NULL,
commented_code_linter = NULL
commented_code_linter = NULL,
extraction_operator_linter = NULL,
implicit_integer_linter = NULL,
nonportable_path_linter = NULL,
undesirable_function_linter = NULL,
numeric_leading_zero_linter = NULL,
todo_comment_linter = NULL,
fixed_regex_linter = NULL,
unnecessary_lambda_linter = NULL,
paste_linter = NULL
)
encoding: "UTF-8"
10 changes: 5 additions & 5 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: rjd3x13
Type: Package
Title: Seasonal Adjustment with X-13 in 'JDemetra+ 3.x'
Version: 3.2.3
Version: 3.3.0
Authors@R: c(
person("Jean", "Palate", role = c("aut"),
email = "[email protected]"),
Expand All @@ -20,14 +20,14 @@ Depends:
R (>= 4.1.0)
Imports:
rJava (>= 1.0-6),
rjd3toolkit (>= 3.2.2),
rjd3toolkit (>= 3.3.0),
RProtoBuf (>= 0.4.17)
Remotes:
github::rjdverse/rjd3toolkit@*release
github::rjdverse/rjd3toolkit
SystemRequirements: Java (>= 17)
License: EUPL
License: file LICENSE
URL: https://github.com/rjdverse/rjd3x13, https://rjdverse.github.io/rjd3x13/
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
Roxygen: list(markdown = TRUE)
BugReports: https://github.com/rjdverse/rjd3x13/issues
Encoding: UTF-8
Expand Down
3 changes: 3 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ S3method(print,JD3_X11_SPEC)
S3method(print,JD3_X13_OUTPUT)
S3method(print,JD3_X13_RSLTS)
S3method(print,JD3_X13_SPEC)
S3method(print,summary.JD3_X13_RSLTS)
S3method(remove_outlier,JD3_X13_SPEC)
S3method(remove_ramp,JD3_X13_SPEC)
S3method(residuals,JD3_REGARIMA_OUTPUT)
Expand All @@ -41,6 +42,8 @@ S3method(set_transform,JD3_X13_SPEC)
S3method(set_x11,JD3_X11_SPEC)
S3method(set_x11,JD3_X13_SPEC)
S3method(summary,JD3_REGARIMA_OUTPUT)
S3method(summary,JD3_X13_OUTPUT)
S3method(summary,JD3_X13_RSLTS)
S3method(vcov,JD3_REGARIMA_OUTPUT)
S3method(vcov,JD3_X13_OUTPUT)
export(.jd2r_spec_regarima)
Expand Down
19 changes: 13 additions & 6 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,27 @@

All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres
to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

## [3.3.0] - 2024-10-28

### Changed

- New java libraries

## [3.2.3] - 2024-07-12

### Changed

* New .jar (related to release [3.2.4](https://github.com/jdemetra/jdplus-main/releases/tag/v3.2.4))
* Some linting of R functions
- New .jar (related to release)
- Some linting of R functions

## [3.2.2] - 2024-03-15

[Unreleased]: https://github.com/rjdverse/rjd3x13/compare/v3.2.3...HEAD

[Unreleased]: https://github.com/rjdverse/rjd3x13/compare/v3.3.0...HEAD
[3.3.0]: https://github.com/rjdverse/rjd3x13/releases/tag/v3.2.3...v3.3.0
[3.2.3]: https://github.com/rjdverse/rjd3x13/releases/tag/v3.2.2...v3.2.3
[3.2.2]: https://github.com/rjdverse/rjd3x13/releases/tag/v3.2.2

34 changes: 20 additions & 14 deletions R/deprecated.R
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,37 @@
#' @param ts,spec,context,userdefined,name Parameters.
#' @name deprecated-rjd3x13
#' @export
spec_x13<-function(name = c("rsa4","rsa0", "rsa1", "rsa2c", "rsa3", "rsa5c")){
.Deprecated("x13_spec")
x13_spec(name)
spec_x13 <- function(name = c("rsa4", "rsa0", "rsa1", "rsa2c", "rsa3", "rsa5c")) {
.Deprecated("x13_spec")
x13_spec(name)
}
#' @name deprecated-rjd3x13
#' @export
spec_regarima<-function(name=c("rg4","rg0", "rg1", "rg2c", "rg3", "rg5c")){
.Deprecated("regarima_spec")
regarima_spec(name)
spec_regarima <- function(name = c("rg4", "rg0", "rg1", "rg2c", "rg3", "rg5c")) {
.Deprecated("regarima_spec")
regarima_spec(name)
}
#' @name deprecated-rjd3x13
#' @export
spec_x11 <- function() {
.Deprecated("x11_spec")
x11_spec()
.Deprecated("x11_spec")
x11_spec()
}
#' @name deprecated-rjd3x13
#' @export
fast_x13<-function(ts, spec=c("rsa4", "rsa0", "rsa1", "rsa2c", "rsa3", "rsa5c"), context=NULL, userdefined = NULL){
.Deprecated("x13_fast")
x13_fast(ts, spec, context, userdefined)
fast_x13 <- function(ts,
spec = c("rsa4", "rsa0", "rsa1", "rsa2c", "rsa3", "rsa5c"),
context = NULL,
userdefined = NULL) {
.Deprecated("x13_fast")
x13_fast(ts, spec, context, userdefined)
}
#' @name deprecated-rjd3x13
#' @export
fast_regarima<-function(ts, spec= c("rg4", "rg0", "rg1", "rg2c", "rg3","rg5c"), context=NULL, userdefined = NULL){
.Deprecated("regarima_fast")
regarima_fast(ts, spec, context, userdefined)
fast_regarima <- function(ts,
spec = c("rg4", "rg0", "rg1", "rg2c", "rg3", "rg5c"),
context = NULL,
userdefined = NULL) {
.Deprecated("regarima_fast")
regarima_fast(ts, spec, context, userdefined)
}
Loading
Loading