Merge pull request #63 from palatej/develop

New java libraries + code cleanup

.lintr

@@ -1,9 +1,36 @@
-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,
         # line_length_linter = lintr::line_length_linter(80L),
-        line_length_linter = lintr::line_length_linter(150L),
-        # cyclocomp_linter = lintr::cyclocomp_linter(complexity_limit = 15L),
-        cyclocomp_linter = lintr::cyclocomp_linter(complexity_limit = 50L),
-        object_name_linter = NULL
+        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,
+        function_left_parentheses_linter = NULL,
+        spaces_left_parentheses_linter = NULL,
+        commas_linter = NULL,
+        quotes_linter = NULL,
+        spaces_inside_linter = NULL,
+        vector_logic_linter = NULL,
+        seq_linter = NULL,
+        object_length_linter = NULL,
+        semicolon_linter = NULL,
+        cyclocomp_linter = NULL,
+        object_usage_linter = NULL,
+        object_name_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"

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: rjd3x13
 Type: Package
 Title: Seasonal Adjustment with X-13 in 'JDemetra+ 3.x'
-Version: 3.2.3.9000
+Version: 3.3.0
 Authors@R: c(
   person("Jean", "Palate", role = c("aut"),
                 email = "[email protected]"),
@@ -20,12 +20,12 @@ 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
 SystemRequirements: Java (>= 17)
-License: EUPL
+License: file LICENSE
 URL: https://github.com/rjdverse/rjd3x13, https://rjdverse.github.io/rjd3x13/
 RoxygenNote: 7.3.2
 Roxygen: list(markdown = TRUE)

NEWS.md

@@ -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
-

R/print.R

@@ -388,9 +388,7 @@ print.JD3_X13_SPEC <- function(x, ...) {
 
     cat("\n", "Benchmarking", "\n", sep = "")
 
-    if (!x$benchmarking$enabled) {
-        cat("Is enabled: No\n")
-    } else {
+    if (x$benchmarking$enabled) {
         cat("Enabled: Yes\n", sep = "")
         cat("Target: ", x$benchmarking$target,
             ifelse(
@@ -411,6 +409,8 @@ print.JD3_X13_SPEC <- function(x, ...) {
         cat("Use forecast: ",
             ifelse(test = x$benchmarking$forecast, yes = "Yes", no = "No (Auto)"),
             "\n", sep = "")
+    } else {
+        cat("Is enabled: No\n")
     }
 
     return(invisible(x))

R/set_x11_spec.R

@@ -167,11 +167,11 @@ set_x11.JD3_X11_SPEC <- function(
         x$excludefcasts <- exclude.forecast
     }
     if (!anyNA(sigma.vector)) {
-        if (!all(sigma.vector %in% c(1, 2))) {
-            warning("sigma.vector must be equal to 1 or 2")
-        } else {
+        if (all(sigma.vector %in% c(1, 2))) {
             x$sigma <- "SELECT"
             x$vsigmas <- as.integer(sigma.vector)
+        } else {
+            warning("sigma.vector must be equal to 1 or 2")
         }
     }
     if (!is.na(bias)) {

R/zzz.R

@@ -18,6 +18,6 @@
         options(summary_info = TRUE)
     }
     if (is.null(getOption("thresholds_pval"))) {
-        options(thresholds_pval = c("Severe" = 0.001, "Bad" = 0.01, "Uncertain" = 0.05, "Good" = Inf))
+        options(thresholds_pval = c(Severe = 0.001, Bad = 0.01, Uncertain = 0.05, Good = Inf))
     }
 }

pom.xml

@@ -11,7 +11,7 @@
 	<description>Usage: mvn -Pcopy-jars</description>
 
 	<properties>
-		<jdplus-main.version>3.2.4</jdplus-main.version>
+		<jdplus-main.version>3.3.0</jdplus-main.version>
 	</properties>
 
 	<dependencies>