Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
charphi committed May 11, 2023
2 parents b4cdbc7 + d603084 commit 6d56057
Show file tree
Hide file tree
Showing 71 changed files with 360 additions and 115 deletions.
12 changes: 11 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,20 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

## [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.

### Added

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

[Unreleased]: https://github.com/jdemetra/jd3-main/compare/v3.0.0...HEAD
[Unreleased]: https://github.com/jdemetra/jd3-main/compare/v3.0.1...HEAD
[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
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-sa-base-parent</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</parent>

<artifactId>jdplus-sa-base-api</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-sa-base-parent</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</parent>

<artifactId>jdplus-sa-base-core</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-sa-base-parent</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</parent>

<artifactId>jdplus-sa-base-csv</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,38 @@
import jdplus.toolkit.base.api.math.Complex;
import jdplus.toolkit.base.api.processing.GenericOutput;
import jdplus.toolkit.base.api.util.NamedObject;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;

import java.io.IOException;
import java.io.StringWriter;
import java.util.Collections;
import java.util.List;
import java.util.Locale;

import static jdplus.sa.base.csv.CsvInformationFormatter.*;
import static org.assertj.core.api.Assertions.assertThat;

class CsvInformationFormatterTest {

private static Locale SAVED_LOCALE;
private static char SAVED_CSV_SEPARATOR;

@BeforeAll
public static void beforeAll() {
SAVED_LOCALE = getLocale();
setLocale(Locale.ROOT);
SAVED_CSV_SEPARATOR = getCsvSeparator();
setCsvSeparator(',');
}

@AfterAll
public static void afterAll() {
setLocale(SAVED_LOCALE);
setCsvSeparator(SAVED_CSV_SEPARATOR);
}

@Test
public void testFormattedTypes() {
assertThat(formattedTypes())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-sa-base-parent</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</parent>

<artifactId>jdplus-sa-base-information</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-sa-base-parent</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</parent>

<artifactId>jdplus-sa-base-protobuf</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-sa-base-parent</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</parent>

<artifactId>jdplus-sa-base-r</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-sa-base-parent</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</parent>

<artifactId>jdplus-sa-base-workspace</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-sa-base-parent</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</parent>

<artifactId>jdplus-sa-base-xml</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-sa-base-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-main-base</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</parent>

<artifactId>jdplus-sa-base-parent</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-spreadsheet-base-parent</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</parent>

<artifactId>jdplus-spreadsheet-base-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-spreadsheet-base-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-main-base</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</parent>

<artifactId>jdplus-spreadsheet-base-parent</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-sql-base-parent</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</parent>

<artifactId>jdplus-sql-base-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-sql-base-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-main-base</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</parent>

<artifactId>jdplus-sql-base-parent</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-text-base-parent</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</parent>

<artifactId>jdplus-text-base-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-text-base-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-main-base</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</parent>

<artifactId>jdplus-text-base-parent</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-toolkit-base-parent</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</parent>

<artifactId>jdplus-toolkit-base-api</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-toolkit-base-parent</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</parent>

<artifactId>jdplus-toolkit-base-core</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-toolkit-base-parent</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</parent>

<artifactId>jdplus-toolkit-base-information</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-toolkit-base-parent</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</parent>

<artifactId>jdplus-toolkit-base-protobuf</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-toolkit-base-parent</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</parent>

<artifactId>jdplus-toolkit-base-r</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-toolkit-base-parent</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</parent>

<artifactId>jdplus-toolkit-base-tsp</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-toolkit-base-parent</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</parent>

<artifactId>jdplus-toolkit-base-tspbridge</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-toolkit-base-parent</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</parent>

<artifactId>jdplus-toolkit-base-workspace</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-toolkit-base-parent</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</parent>

<artifactId>jdplus-toolkit-base-xml</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-toolkit-base-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-main-base</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</parent>

<artifactId>jdplus-toolkit-base-parent</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-tramoseats-base-parent</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</parent>

<artifactId>jdplus-tramoseats-base-api</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-tramoseats-base-parent</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</parent>

<artifactId>jdplus-tramoseats-base-core</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-tramoseats-base-parent</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</parent>

<artifactId>jdplus-tramoseats-base-information</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-tramoseats-base-parent</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</parent>

<artifactId>jdplus-tramoseats-base-protobuf</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-tramoseats-base-parent</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</parent>

<artifactId>jdplus-tramoseats-base-r</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-tramoseats-base-parent</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</parent>

<artifactId>jdplus-tramoseats-base-workspace</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-tramoseats-base-parent</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</parent>

<artifactId>jdplus-tramoseats-base-xml</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jdplus-main-base/jdplus-tramoseats-base-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-main-base</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</parent>

<artifactId>jdplus-tramoseats-base-parent</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-x13-base-parent</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</parent>

<artifactId>jdplus-x13-base-api</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>eu.europa.ec.joinup.sat</groupId>
<artifactId>jdplus-x13-base-parent</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</parent>

<artifactId>jdplus-x13-base-core</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ public void testProcess_Add_Forecast12() {
}

@Test
@Disabled(value = "Error in 2.2.2 - Will work with 2.2.3")
public void testProcess_mult_Halfyearly_autoHenderson() {
String modeName = DecompositionMode.LogAdditive.name();
String seasonalFilterOptionName = SeasonalFilterOption.S3X5.name();
Expand All @@ -98,7 +97,6 @@ public void testProcess_mult_Halfyearly_autoHenderson() {
}

@Test
@Disabled(value = "Error in 2.2.2 - Will work with 2.2.3")
public void testProcess_LogAdd_Halfyearly() {
String modeName = DecompositionMode.LogAdditive.name();
String seasonalFilterOptionName = SeasonalFilterOption.S3X5.name();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ public void test_12_Stable_AllNone_StartAll() {
}

@Test
@Disabled(value = "Error in 2.2.2 - Will work with 2.2.3")
public void test_12_S3X5Stable_AllNone_StartAll_Add() {

String modeName = DecompositionMode.Additive.name();
Expand Down
Loading

0 comments on commit 6d56057

Please sign in to comment.