Merge branch 'develop'

jdemetra · Jun 14, 2023 · 6dc8ec1 · 6dc8ec1
2 parents 6d56057 + 39adf7f
commit 6dc8ec1
Show file tree

Hide file tree

Showing 105 changed files with 642 additions and 450 deletions.
diff --git a/.github/workflows/java-ea-maven.yml b/.github/workflows/java-ea-maven.yml
@@ -0,0 +1,37 @@
+name: Java-EA with Maven
+
+on:
+  push:
+    branches:
+      - develop
+  workflow_dispatch:
+
+jobs:
+  build-and-test-job:
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [ '-ea' ]
+        os: [ ubuntu-latest ]
+
+    name: JDK${{ matrix.java }} on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+          fetch-depth: 0
+
+      - name: Setup Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: ${{ matrix.java }}
+          cache: 'maven'
+
+      - name: Build and (headless) test with Maven
+        uses: smithki/xvfb-action@v1.1.2
+        with:
+          run: mvn -U -B -ntp package
diff --git a/.github/workflows/java-maven.yml b/.github/workflows/java-maven.yml
@@ -29,7 +29,7 @@ jobs:
           cache: 'maven'
 
       - name: Build and (headless) test with Maven
-        uses: GabrielBB/xvfb-action@v1
+        uses: smithki/xvfb-action@v1.1.2
         with:
           run: mvn -U -B -ntp package
 
@@ -59,21 +59,30 @@ jobs:
           cache: 'maven'
 
       - name: Deploy snapshot with Maven if settings defined
-        run: test ! -f ci.settings.xml || mvn -B -ntp deploy -DskipTests=true -s ci.settings.xml -P base-deploy,snapshot-deploy,!non-deployable-modules
+        run: test ! -f ci.settings.xml || mvn -B -ntp deploy -DskipTests -s ci.settings.xml -P base-deploy,snapshot-deploy,!non-deployable-modules
         env:
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
           SIGN_KEY: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
           SIGN_KEY_PASS: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
 
       - name: Dryrun release assets with Maven
-        run: mvn -B -ntp install -DskipTests=true -P full-release -Djreleaser.dry.run=true
+        run: mvn -B -ntp install -DskipTests -P full-release -Djreleaser.output.directory=$PWD/out/jreleaser -Djreleaser.dry.run
         env:
           JRELEASER_GITHUB_TOKEN: ${{ secrets.JRELEASER_GITHUB_TOKEN }}
           JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.MAVEN_GPG_PUBLIC_KEY }}
           JRELEASER_GPG_SECRET_KEY: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
           JRELEASER_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
 
+      - name: Upload JReleaser output
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: assets-snapshot-log
+          path: |
+            out/jreleaser/trace.log
+            out/jreleaser/output.properties
+
   release-job:
     needs: build-and-test-job
     if: startsWith(github.repository, 'jdemetra/') && startsWith(github.ref, 'refs/tags/v')
@@ -100,7 +109,7 @@ jobs:
           cache: 'maven'
 
       - name: Deploy with Maven if settings defined
-        run: test ! -f ci.settings.xml || mvn -B -ntp deploy -DskipTests=true -s ci.settings.xml -P base-deploy,release-deploy,!non-deployable-modules
+        run: test ! -f ci.settings.xml || mvn -B -ntp deploy -DskipTests -s ci.settings.xml -P base-deploy,release-deploy,!non-deployable-modules
         env:
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
@@ -110,9 +119,18 @@ jobs:
           MAVEN_OPTS: "--add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.desktop/java.awt.font=ALL-UNNAMED"
 
       - name: Release assets with Maven
-        run: mvn -B -ntp install -DskipTests=true -P full-release
+        run: mvn -B -ntp install -DskipTests -P full-release -Djreleaser.output.directory=$PWD/out/jreleaser
         env:
           JRELEASER_GITHUB_TOKEN: ${{ secrets.JRELEASER_GITHUB_TOKEN }}
           JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.MAVEN_GPG_PUBLIC_KEY }}
           JRELEASER_GPG_SECRET_KEY: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
           JRELEASER_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
+
+      - name: Upload JReleaser output
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: assets-release-log
+          path: |
+            out/jreleaser/trace.log
+            out/jreleaser/output.properties
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,20 +7,44 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [3.0.2] - 2023-06-14
+
+### Changed
+
+- ![OTHER] DeepSelect instead of Select to read MetaData with "." in key
+- ![UI] Change DataSourceProviderBuddy signature to broaden use
+
+### Fixed
+
+- ![STAT] Correct forecasts/backcasts in the Burman algorithm (SEATS)
+- ![STAT] Implement X11 without seasonal component
+- ![STAT] Correct Tramo outliers detection with missing values
+- ![UI] Fix missing provider info in property sheet
+- ![UI] Fix missing icons in providers
+
 ## [3.0.1] - 2023-05-11
 
-This the release of JDemetra+ v3.0.1.  
-[Java SE 17 or later](https://adoptium.net/) version is required to run it.
+This is a **patch release** of JDemetra+ v3.0.1.  
+Its sole purpose is to simplify the installation by providing Windows-specific binaries in addition to the platform-independent packages.
+These binaries are self-sufficient and therefore don't require Java anymore.
+
+Install instructions are available at https://github.com/jdemetra/jdplus-main#installing.
 
 ### Added
 
-- Add Windows binaries to release
+- ![OTHER] Add Windows binaries to release
 
 ## [3.0.0] - 2023-05-02
 
-This the release of JDemetra+ v3.0.0.  
-[Java SE 17 or later](https://adoptium.net/) version is required to run it.
+This is the **initial release** of JDemetra+ v3.0.0.  
+[Java SE 17 or later](https://whichjdk.com/) version is required to run it.
 
-[Unreleased]: https://github.com/jdemetra/jd3-main/compare/v3.0.1...HEAD
+[Unreleased]: https://github.com/jdemetra/jd3-main/compare/v3.0.2...HEAD
+[3.0.2]: https://github.com/jdemetra/jd3-main/compare/v3.0.1...v3.0.2
 [3.0.1]: https://github.com/jdemetra/jd3-main/compare/v3.0.0...v3.0.1
 [3.0.0]: https://github.com/jdemetra/jd3-main/releases/tag/v3.0.0
+
+[STAT]: https://img.shields.io/badge/-STAT-068C09
+[OTHER]: https://img.shields.io/badge/-OTHER-e4e669
+[IO]: https://img.shields.io/badge/-IO-F813F7
+[UI]: https://img.shields.io/badge/-UI-5319E7
diff --git a/README.md b/README.md
@@ -1,14 +1,30 @@
 # JDemetra+ v3
 
+[![Download](https://img.shields.io/github/release/jdemetra/jdplus-main.svg)](https://github.com/jdemetra/jdplus-main/releases/latest)
+
 **JDemetra+ is a tool for seasonal adjustment (SA)** developed by the National Bank of Belgium (NBB) in cooperation with the Deutsche Bundesbank and Eurostat in accordance with the Guidelines of the European Statistical System (ESS).
 
-## Installing / Getting started
+Its main **documentation** is available at https://jdemetra-new-documentation.netlify.app.
+
+## Installing
 
-JDemetra+ v3 runs on any operating system that supports **Java 17 or later** such as Microsoft **Windows**, **Solaris OS**, Apple **macOS**, **Ubuntu** and other various **Linux** distributions.
+JDemetra+ v3 runs on any desktop operating system such as Microsoft **Windows**, **Solaris OS**, Apple **macOS**, **Ubuntu** and other various **Linux** distributions.
 
-The project is still in development, but you can find **daily builds** and install instructions at https://github.com/nbbrd/jdemetra-app-snapshot.
+Windows-specific packages are provided in addition to the platform-independent packages.
+These specific packages are self-sufficient and therefore don't require Java to run.
 
-Its main **documentation** is available at https://jdemetra-new-documentation.netlify.app.
+### Microsoft Windows
+
+1. **Download** the [Windows-specific package](https://github.com/jdemetra/jdplus-main/releases) (`jdemetra-*-windows-bin.zip`)
+2. **Extract** it to any folder on your system (i.e. `_DEMETRA_PATH_`)
+3. **Run** the executable file `nbdemetra64.exe` located in the `_DEMETRA_PATH_/bin` directory
+
+### Other operating systems
+
+1. **Install** [Java version 17 or later](https://whichjdk.com/)
+2. **Download** the [platform-independent package](https://github.com/jdemetra/jdplus-main/releases) (`jdemetra-*-bin.zip`)
+3. **Extract** it to any folder on your system (i.e. `_DEMETRA_PATH_`)
+4. **Run** the executable file `$ ./nbdemetra` located in the `_DEMETRA_PATH_/bin` directory
 
 ## Developing
 
@@ -22,6 +38,8 @@ cd jdplus-main
 mvn clean install
 ```
 
+Daily builds are also available at https://github.com/nbbrd/jdemetra-app-snapshot.
+
 ### Structure
 
 JDemetra+ code is **divided into topics** (toolkit, x13, ...) and is **grouped by lifecycle** (main, experimental, ...).  

diff --git a/jdplus-main-base/jdplus-sa-base-parent/jdplus-sa-base-api/pom.xml b/jdplus-main-base/jdplus-sa-base-parent/jdplus-sa-base-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>eu.europa.ec.joinup.sat</groupId>
         <artifactId>jdplus-sa-base-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.2</version>
     </parent>
 
     <artifactId>jdplus-sa-base-api</artifactId>

diff --git a/jdplus-main-base/jdplus-sa-base-parent/jdplus-sa-base-core/pom.xml b/jdplus-main-base/jdplus-sa-base-parent/jdplus-sa-base-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>eu.europa.ec.joinup.sat</groupId>
         <artifactId>jdplus-sa-base-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.2</version>
     </parent>
 
     <artifactId>jdplus-sa-base-core</artifactId>

diff --git a/jdplus-main-base/jdplus-sa-base-parent/jdplus-sa-base-csv/pom.xml b/jdplus-main-base/jdplus-sa-base-parent/jdplus-sa-base-csv/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>eu.europa.ec.joinup.sat</groupId>
         <artifactId>jdplus-sa-base-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.2</version>
     </parent>
 
     <artifactId>jdplus-sa-base-csv</artifactId>

diff --git a/jdplus-main-base/jdplus-sa-base-parent/jdplus-sa-base-information/pom.xml b/jdplus-main-base/jdplus-sa-base-parent/jdplus-sa-base-information/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>eu.europa.ec.joinup.sat</groupId>
         <artifactId>jdplus-sa-base-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.2</version>
     </parent>
 
     <artifactId>jdplus-sa-base-information</artifactId>

diff --git a/...nt/jdplus-sa-base-information/src/main/java/jdplus/sa/base/information/SaItemMapping.java b/...nt/jdplus-sa-base-information/src/main/java/jdplus/sa/base/information/SaItemMapping.java
@@ -91,7 +91,7 @@ public SaItem read(InformationSet info, NameManager<SaSpecification> defaults, M
         }
         InformationSet md = info.getSubSet(METADATA);
         if (md != null) {
-            List<Information<String>> sel = md.select(String.class);
+            List<Information<String>> sel = md.deepSelect(String.class);
             sel.forEach(v -> builder.meta(v.getName(), v.getValue()));
         }
         String name = info.get(NAME, String.class);

diff --git a/jdplus-main-base/jdplus-sa-base-parent/jdplus-sa-base-protobuf/pom.xml b/jdplus-main-base/jdplus-sa-base-parent/jdplus-sa-base-protobuf/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>eu.europa.ec.joinup.sat</groupId>
         <artifactId>jdplus-sa-base-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.2</version>
     </parent>
 
     <artifactId>jdplus-sa-base-protobuf</artifactId>

diff --git a/jdplus-main-base/jdplus-sa-base-parent/jdplus-sa-base-r/pom.xml b/jdplus-main-base/jdplus-sa-base-parent/jdplus-sa-base-r/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>eu.europa.ec.joinup.sat</groupId>
         <artifactId>jdplus-sa-base-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.2</version>
     </parent>
 
     <artifactId>jdplus-sa-base-r</artifactId>

diff --git a/jdplus-main-base/jdplus-sa-base-parent/jdplus-sa-base-workspace/pom.xml b/jdplus-main-base/jdplus-sa-base-parent/jdplus-sa-base-workspace/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>eu.europa.ec.joinup.sat</groupId>
         <artifactId>jdplus-sa-base-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.2</version>
     </parent>
 
     <artifactId>jdplus-sa-base-workspace</artifactId>

diff --git a/jdplus-main-base/jdplus-sa-base-parent/jdplus-sa-base-xml/pom.xml b/jdplus-main-base/jdplus-sa-base-parent/jdplus-sa-base-xml/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>eu.europa.ec.joinup.sat</groupId>
         <artifactId>jdplus-sa-base-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.2</version>
     </parent>
 
     <artifactId>jdplus-sa-base-xml</artifactId>

diff --git a/jdplus-main-base/jdplus-sa-base-parent/pom.xml b/jdplus-main-base/jdplus-sa-base-parent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>eu.europa.ec.joinup.sat</groupId>
         <artifactId>jdplus-main-base</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.2</version>
     </parent>
 
     <artifactId>jdplus-sa-base-parent</artifactId>

diff --git a/jdplus-main-base/jdplus-spreadsheet-base-parent/jdplus-spreadsheet-base-api/pom.xml b/jdplus-main-base/jdplus-spreadsheet-base-parent/jdplus-spreadsheet-base-api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>eu.europa.ec.joinup.sat</groupId>
         <artifactId>jdplus-spreadsheet-base-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.2</version>
     </parent>
 
     <artifactId>jdplus-spreadsheet-base-api</artifactId>

diff --git a/jdplus-main-base/jdplus-spreadsheet-base-parent/pom.xml b/jdplus-main-base/jdplus-spreadsheet-base-parent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>eu.europa.ec.joinup.sat</groupId>
         <artifactId>jdplus-main-base</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.2</version>
     </parent>
 
     <artifactId>jdplus-spreadsheet-base-parent</artifactId>

diff --git a/jdplus-main-base/jdplus-sql-base-parent/jdplus-sql-base-api/pom.xml b/jdplus-main-base/jdplus-sql-base-parent/jdplus-sql-base-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>eu.europa.ec.joinup.sat</groupId>
         <artifactId>jdplus-sql-base-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.2</version>
     </parent>
 
     <artifactId>jdplus-sql-base-api</artifactId>

diff --git a/jdplus-main-base/jdplus-sql-base-parent/pom.xml b/jdplus-main-base/jdplus-sql-base-parent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>eu.europa.ec.joinup.sat</groupId>
         <artifactId>jdplus-main-base</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.2</version>
     </parent>
 
     <artifactId>jdplus-sql-base-parent</artifactId>

diff --git a/jdplus-main-base/jdplus-text-base-parent/jdplus-text-base-api/pom.xml b/jdplus-main-base/jdplus-text-base-parent/jdplus-text-base-api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>eu.europa.ec.joinup.sat</groupId>
         <artifactId>jdplus-text-base-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.2</version>
     </parent>
 
     <artifactId>jdplus-text-base-api</artifactId>

diff --git a/jdplus-main-base/jdplus-text-base-parent/pom.xml b/jdplus-main-base/jdplus-text-base-parent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>eu.europa.ec.joinup.sat</groupId>
         <artifactId>jdplus-main-base</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.2</version>
     </parent>
 
     <artifactId>jdplus-text-base-parent</artifactId>

diff --git a/jdplus-main-base/jdplus-toolkit-base-parent/jdplus-toolkit-base-api/pom.xml b/jdplus-main-base/jdplus-toolkit-base-parent/jdplus-toolkit-base-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>eu.europa.ec.joinup.sat</groupId>
         <artifactId>jdplus-toolkit-base-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.2</version>
     </parent>
 
     <artifactId>jdplus-toolkit-base-api</artifactId>

diff --git a/...nt/jdplus-toolkit-base-api/src/main/java/jdplus/toolkit/base/api/timeseries/TsPeriod.java b/...nt/jdplus-toolkit-base-api/src/main/java/jdplus/toolkit/base/api/timeseries/TsPeriod.java
@@ -146,15 +146,15 @@ public TsPeriod withId(long id) {
     }
 
     /**
-     * Distance between this period and the given period (exclusive)
+     * Distance between this period and the given period
      *
-     * @param endExclusive The given period
+     * @param end The given period
      * @return The result is 0 when the two periods are equal, positive if the
      * given period is after this period or negative otherwise.
      */
-    public int until(TsPeriod endExclusive) {
-        checkCompatibility(endExclusive);
-        return (int) (getRebasedId(endExclusive) - id);
+    public int until(TsPeriod end) {
+        checkCompatibility(end);
+        return (int) (getRebasedId(end) - id);
     }
 
     //    /**

diff --git a/jdplus-main-base/jdplus-toolkit-base-parent/jdplus-toolkit-base-core/pom.xml b/jdplus-main-base/jdplus-toolkit-base-parent/jdplus-toolkit-base-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>eu.europa.ec.joinup.sat</groupId>
         <artifactId>jdplus-toolkit-base-parent</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.2</version>
     </parent>
 
     <artifactId>jdplus-toolkit-base-core</artifactId>

diff --git a/...ase-core/src/main/java/internal/toolkit/base/core/math/functions/riso/LbfgsMinimizer.java b/...ase-core/src/main/java/internal/toolkit/base/core/math/functions/riso/LbfgsMinimizer.java
@@ -128,7 +128,8 @@ public double getGTol() {
      *
      * @return
      */
-    public int getNIter() {
+    @Override
+    public int getIterationsCount() {
         return lbfgs.getNIter();
     }