Upgrade to version 2.1 of VTL

Making-Sense-Info · Oct 9, 2024 · eac04af · eac04af
2 parents 5e25263 + 6c63113
commit eac04af
Show file tree

Hide file tree

Showing 41 changed files with 589 additions and 163 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 16.19.0
+          node-version: 22
       - name: Install dependencies
         run: yarn install --frozen-lockfile
         working-directory: docs

diff --git a/README.md b/README.md
@@ -29,3 +29,17 @@ If you want to contribute, see this [guide](docs/CONTRIBUTING.md).
 ## Requirements
 
 Open JDK 8+ is required.
+
+## References
+
+<p align="center">
+  <img width="100px" src="./docs/static/img/sdmx-io-logo.svg" />
+</p>
+
+Trevas is part of the [sdmx.io](https://www.sdmx.io/) ecosystem.
+
+<p align="center">
+    <img  src="https://awesome.re/mentioned-badge.svg" />
+</p>
+
+Trevas is referencing by [_Awesome official statistics software_](https://github.com/SNStatComp/awesome-official-statistics-software)
diff --git a/coverage/pom.xml b/coverage/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>fr.insee.trevas</groupId>
         <artifactId>trevas-parent</artifactId>
-        <version>1.6.0</version>
+        <version>1.7.0</version>
     </parent>
 
     <artifactId>coverage</artifactId>
@@ -22,32 +22,32 @@
         <dependency>
             <groupId>fr.insee.trevas</groupId>
             <artifactId>vtl-engine</artifactId>
-            <version>1.6.0</version>
+            <version>1.7.0</version>
         </dependency>
         <dependency>
             <groupId>fr.insee.trevas</groupId>
             <artifactId>vtl-jackson</artifactId>
-            <version>1.6.0</version>
+            <version>1.7.0</version>
         </dependency>
         <dependency>
             <groupId>fr.insee.trevas</groupId>
             <artifactId>vtl-jdbc</artifactId>
-            <version>1.6.0</version>
+            <version>1.7.0</version>
         </dependency>
         <dependency>
             <groupId>fr.insee.trevas</groupId>
             <artifactId>vtl-model</artifactId>
-            <version>1.6.0</version>
+            <version>1.7.0</version>
         </dependency>
         <dependency>
             <groupId>fr.insee.trevas</groupId>
             <artifactId>vtl-parser</artifactId>
-            <version>1.6.0</version>
+            <version>1.7.0</version>
         </dependency>
         <dependency>
             <groupId>fr.insee.trevas</groupId>
             <artifactId>vtl-spark</artifactId>
-            <version>1.6.0</version>
+            <version>1.7.0</version>
         </dependency>
     </dependencies>
     <build>

diff --git a/docs/docs/user-guide/coverage/analytic-operators.mdx b/docs/docs/user-guide/coverage/analytic-operators.mdx
@@ -6,22 +6,12 @@ slug: /user-guide/coverage/analytic-operators
 custom_edit_url: null
 ---
 
-| Name                               | Symbol          | InMemory |       Spark        |
-| ---------------------------------- | :-------------- | :------: | :----------------: |
-| Analytic invocation                |                 |   :x:    | :heavy_check_mark: |
-| Counting the number of data points | count           |   :x:    | :heavy_check_mark: |
-| Minimum value                      | min             |   :x:    | :heavy_check_mark: |
-| Maximum value                      | max             |   :x:    | :heavy_check_mark: |
-| Median value                       | median          |   :x:    | :heavy_check_mark: |
-| Sum                                | sum             |   :x:    | :heavy_check_mark: |
-| Average value                      | avg             |   :x:    | :heavy_check_mark: |
-| Population standard deviation      | stddev_pop      |   :x:    | :heavy_check_mark: |
-| Sample standard deviation          | stddev_samp     |   :x:    | :heavy_check_mark: |
-| Population variance                | var_pop         |   :x:    | :heavy_check_mark: |
-| Sample variance                    | var_samp        |   :x:    | :heavy_check_mark: |
-| First value                        | first_value     |   :x:    | :heavy_check_mark: |
-| Last value                         | last_value      |   :x:    | :heavy_check_mark: |
-| Lag                                | lag             |   :x:    | :heavy_check_mark: |
-| lead                               | lead            |   :x:    | :heavy_check_mark: |
-| Rank                               | rank            |   :x:    | :heavy_check_mark: |
-| Ratio to report                    | ratio_to_report |   :x:    | :heavy_check_mark: |
+| Name                | Symbol          | InMemory |       Spark        |
+| ------------------- | :-------------- | :------: | :----------------: |
+| Analytic invocation |                 |   :x:    | :heavy_check_mark: |
+| First value         | first_value     |   :x:    | :heavy_check_mark: |
+| Last value          | last_value      |   :x:    | :heavy_check_mark: |
+| Lag                 | lag             |   :x:    | :heavy_check_mark: |
+| lead                | lead            |   :x:    | :heavy_check_mark: |
+| Rank                | rank            |   :x:    | :heavy_check_mark: |
+| Ratio to report     | ratio_to_report |   :x:    | :heavy_check_mark: |
diff --git a/docs/docs/user-guide/coverage/conditional-operators.mdx b/docs/docs/user-guide/coverage/conditional-operators.mdx
@@ -9,4 +9,5 @@ custom_edit_url: null
 | Name         | Symbol       |      Boolean       |     Component      |      Dataset       |
 | ------------ | :----------- | :----------------: | :----------------: | :----------------: |
 | If Then Else | if-then-else | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
+| Case         | case         | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | Nvl          | nvl          | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
diff --git a/docs/docs/user-guide/coverage/numeric-operators.mdx b/docs/docs/user-guide/coverage/numeric-operators.mdx
@@ -24,5 +24,6 @@ custom_edit_url: null
 | Exponential       | exp          | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | Natural logarithm | ln           | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | Power             | power        | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
+| Random            | random       | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | Logarithm         | log          | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | Square root       | sqrt         | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
diff --git a/docs/docs/user-guide/coverage/time-operators.mdx b/docs/docs/user-guide/coverage/time-operators.mdx
@@ -6,12 +6,22 @@ slug: /user-guide/coverage/time-operators
 custom_edit_url: null
 ---
 
-| Name             | Symbol           |    Time_period     |     Component      |      Dataset       |
-| ---------------- | :--------------- | :----------------: | :----------------: | :----------------: |
-| Period indicator | period_indicator | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
-| Fill time series | fill_time_series |        N/A         |        N/A         |        :x:         |
-| Flow to stock    | flow_to_stock    |        N/A         |        N/A         | :heavy_check_mark: |
-| Stock to flow    | stock_to_flow    |        N/A         |        N/A         | :heavy_check_mark: |
-| Time shift       | timeshift        | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
-| Time aggregation | time_agg         |        N/A         |        N/A         |        :x:         |
-| Actual time      | current_date     | :heavy_check_mark: |        N/A         |        N/A         |
+| Name                           | Symbol           |    Time_period     |     Component      |      Dataset       |
+| ------------------------------ | :--------------- | :----------------: | :----------------: | :----------------: |
+| Period indicator               | period_indicator | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
+| Fill time series               | fill_time_series |        N/A         |        N/A         |        :x:         |
+| Flow to stock                  | flow_to_stock    |        N/A         |        N/A         | :heavy_check_mark: |
+| Stock to flow                  | stock_to_flow    |        N/A         |        N/A         | :heavy_check_mark: |
+| Time shift                     | timeshift        | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
+| Time aggregation               | time_agg         |        N/A         |        N/A         |        :x:         |
+| Actual time                    | current_date     | :heavy_check_mark: |        N/A         |        N/A         |
+| Subtract dates                 | datediff         |        :x:         |        :x:         |        :x:         |
+| Add to date                    | dateadd          |        :x:         |        :x:         |        :x:         |
+| Year of a date                 | year             |        :x:         |        :x:         |        :x:         |
+| Month of a date                | month            |        :x:         |        :x:         |        :x:         |
+| Number of day within the year  | dayofyear        |        :x:         |        :x:         |        :x:         |
+| Number of day within the month | dayofmonth       |        :x:         |        :x:         |        :x:         |
+| Convert days to years          | daytoyear        |        :x:         |        :x:         |        :x:         |
+| Convert days to months         | daytomonth       |        :x:         |        :x:         |        :x:         |
+| Convert duration in days       | yeartoday        |        :x:         |        :x:         |        :x:         |
+| Convert duration in months     | yeartomonth      |        :x:         |        :x:         |        :x:         |
diff --git a/...cusaurus-plugin-content-docs/current/user-guide/coverage/analytic-operators.mdx b/...cusaurus-plugin-content-docs/current/user-guide/coverage/analytic-operators.mdx
@@ -9,16 +9,6 @@ custom_edit_url: null
 | Nom                                     | Symbole         | InMemory |       Spark        |
 | --------------------------------------- | :-------------- | :------: | :----------------: |
 | Instanciation de l'opérateur analytique |                 |   :x:    | :heavy_check_mark: |
-| Comptage du nombre de point de données  | count           |   :x:    | :heavy_check_mark: |
-| Valeur minimuale                        | min             |   :x:    | :heavy_check_mark: |
-| Valeur maximale                         | max             |   :x:    | :heavy_check_mark: |
-| Valeur médiane                          | median          |   :x:    | :heavy_check_mark: |
-| Somme                                   | sum             |   :x:    | :heavy_check_mark: |
-| Moyenne                                 | avg             |   :x:    | :heavy_check_mark: |
-| Écart-type de la population             | stddev_pop      |   :x:    | :heavy_check_mark: |
-| Écart-type de l'échantillon             | stddev_samp     |   :x:    | :heavy_check_mark: |
-| Variance de la population               | var_pop         |   :x:    | :heavy_check_mark: |
-| Variance de l'échantillon               | var_samp        |   :x:    | :heavy_check_mark: |
 | Première valeur                         | first_value     |   :x:    | :heavy_check_mark: |
 | Dernière valeur                         | last_value      |   :x:    | :heavy_check_mark: |
 | Décalage (vers le bas)                  | lag             |   :x:    | :heavy_check_mark: |

diff --git a/...aurus-plugin-content-docs/current/user-guide/coverage/conditional-operators.mdx b/...aurus-plugin-content-docs/current/user-guide/coverage/conditional-operators.mdx
@@ -9,4 +9,5 @@ custom_edit_url: null
 | Nom            | Symbole      |      Boolean       |     Component      |      Dataset       |
 | -------------- | :----------- | :----------------: | :----------------: | :----------------: |
 | Si Alors Sinon | if-then-else | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
+| Cas            | case         | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | Valeur nulle   | nvl          | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
diff --git a/...ocusaurus-plugin-content-docs/current/user-guide/coverage/numeric-operators.mdx b/...ocusaurus-plugin-content-docs/current/user-guide/coverage/numeric-operators.mdx
@@ -24,5 +24,6 @@ custom_edit_url: null
 | Exponentiel         | exp          | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | Logarithme néperien | ln           | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | Puissance           | power        | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
+| Random              | random       | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | Logarithme          | log          | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | Racine carrée       | sqrt         | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
diff --git a/...r/docusaurus-plugin-content-docs/current/user-guide/coverage/time-operators.mdx b/...r/docusaurus-plugin-content-docs/current/user-guide/coverage/time-operators.mdx
@@ -15,3 +15,13 @@ custom_edit_url: null
 | Time shift                     | timeshift        | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | Décalage dans le temps         | time_agg         |        N/A         |        N/A         |        :x:         |
 | Heure courante                 | current_date     | :heavy_check_mark: |        N/A         |        N/A         |
+| Soustraire des dates           | datediff         |        :x:         |        :x:         |        :x:         |
+| Ajouter à une date             | dateadd          |        :x:         |        :x:         |        :x:         |
+| Année d'une date               | year             |        :x:         |        :x:         |        :x:         |
+| Mois d'une date                | month            |        :x:         |        :x:         |        :x:         |
+| Nombre de jours dans l'année   | dayofyear        |        :x:         |        :x:         |        :x:         |
+| Nombre de jours dans le mois   | dayofmonth       |        :x:         |        :x:         |        :x:         |
+| Convertir des jours en années  | daytoyear        |        :x:         |        :x:         |        :x:         |
+| Convertir des jours en mois    | daytomonth       |        :x:         |        :x:         |        :x:         |
+| Convertir la durée en jours    | yeartoday        |        :x:         |        :x:         |        :x:         |
+| Convertir la durée en mois     | yeartomonth      |        :x:         |        :x:         |        :x:         |
diff --git a/...cusaurus-plugin-content-docs/current/user-guide/coverage/analytic-operators.mdx b/...cusaurus-plugin-content-docs/current/user-guide/coverage/analytic-operators.mdx
@@ -6,22 +6,12 @@ slug: /user-guide/coverage/analytic-operators
 custom_edit_url: null
 ---
 
-| Navn                      | Symbol          | InMemory |       Spark        |
-| ------------------------- | :-------------- | :------: | :----------------: |
-| Analytisk påkalling       |                 |   :x:    | :heavy_check_mark: |
-| Telle antall datapunkter  | count           |   :x:    | :heavy_check_mark: |
-| Minimumsverdi             | min             |   :x:    | :heavy_check_mark: |
-| Maksimal verdi            | max             |   :x:    | :heavy_check_mark: |
-| Medianverdi               | median          |   :x:    | :heavy_check_mark: |
-| Sum                       | sum             |   :x:    | :heavy_check_mark: |
-| Gjennomsnittlig verdi     | avg             |   :x:    | :heavy_check_mark: |
-| Populasjonsstandardavvik  | stddev_pop      |   :x:    | :heavy_check_mark: |
-| Eksempel på standardavvik | stddev_samp     |   :x:    | :heavy_check_mark: |
-| Varianspopulasjon         | var_pop         |   :x:    | :heavy_check_mark: |
-| Prøveavvik                | var_samp        |   :x:    | :heavy_check_mark: |
-| Førsteverdi               | first_value     |   :x:    | :heavy_check_mark: |
-| Siste verdi               | last_value      |   :x:    | :heavy_check_mark: |
-| Lag                       | lag             |   :x:    | :heavy_check_mark: |
-| Leder                     | lead            |   :x:    | :heavy_check_mark: |
-| Rangering                 | rank            |   :x:    | :heavy_check_mark: |
-| Forhold til rapportering  | ratio_to_report |   :x:    | :heavy_check_mark: |
+| Navn                     | Symbol          | InMemory |       Spark        |
+| ------------------------ | :-------------- | :------: | :----------------: |
+| Analytisk påkalling      |                 |   :x:    | :heavy_check_mark: |
+| Førsteverdi              | first_value     |   :x:    | :heavy_check_mark: |
+| Siste verdi              | last_value      |   :x:    | :heavy_check_mark: |
+| Lag                      | lag             |   :x:    | :heavy_check_mark: |
+| Leder                    | lead            |   :x:    | :heavy_check_mark: |
+| Rangering                | rank            |   :x:    | :heavy_check_mark: |
+| Forhold til rapportering | ratio_to_report |   :x:    | :heavy_check_mark: |
diff --git a/...aurus-plugin-content-docs/current/user-guide/coverage/conditional-operators.mdx b/...aurus-plugin-content-docs/current/user-guide/coverage/conditional-operators.mdx
@@ -9,4 +9,5 @@ custom_edit_url: null
 | Navn        | Symbol       |      Boolean       |     Component      |      Dataset       |
 | ----------- | :----------- | :----------------: | :----------------: | :----------------: |
 | Om så annet | if-then-else | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
+| Sak         | case         | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | Null verdi  | nvl          | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
diff --git a/...ocusaurus-plugin-content-docs/current/user-guide/coverage/numeric-operators.mdx b/...ocusaurus-plugin-content-docs/current/user-guide/coverage/numeric-operators.mdx
@@ -24,5 +24,6 @@ custom_edit_url: null
 | Eksponentiell      | exp          | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | Naturlig logaritme | ln           | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | Strøm              | power        | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
+| Random             | random       | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | Logaritme          | log          | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | Kvadratrot         | sqrt         | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
diff --git a/...o/docusaurus-plugin-content-docs/current/user-guide/coverage/time-operators.mdx b/...o/docusaurus-plugin-content-docs/current/user-guide/coverage/time-operators.mdx
@@ -6,12 +6,22 @@ slug: /user-guide/coverage/time-operators
 custom_edit_url: null
 ---
 
-| Navn             | Symbol           |    Time_period     |     Component      |      Dataset       |
-| ---------------- | :--------------- | :----------------: | :----------------: | :----------------: |
-| Periodeindikator | period_indicator | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
-| Fyll tidsserier  | fill_time_series |        N/A         |        N/A         |        :x:         |
-| Flyt til lager   | flow_to_stock    |        N/A         |        N/A         | :heavy_check_mark: |
-| Aksje til flyt   | stock_to_flow    |        N/A         |        N/A         | :heavy_check_mark: |
-| Tidsforskyvning  | timeshift        | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
-| Tidsaggregering  | time_agg         |        N/A         |        N/A         |        :x:         |
-| Faktisk tid      | current_date     | :heavy_check_mark: |        N/A         |        N/A         |
+| Navn                         | Symbol           |    Time_period     |     Component      |      Dataset       |
+| ---------------------------- | :--------------- | :----------------: | :----------------: | :----------------: |
+| Periodeindikator             | period_indicator | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
+| Fyll tidsserier              | fill_time_series |        N/A         |        N/A         |        :x:         |
+| Flyt til lager               | flow_to_stock    |        N/A         |        N/A         | :heavy_check_mark: |
+| Aksje til flyt               | stock_to_flow    |        N/A         |        N/A         | :heavy_check_mark: |
+| Tidsforskyvning              | timeshift        | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
+| Tidsaggregering              | time_agg         |        N/A         |        N/A         |        :x:         |
+| Faktisk tid                  | current_date     | :heavy_check_mark: |        N/A         |        N/A         |
+| Trekk fra datoer             | datediff         |        :x:         |        :x:         |        :x:         |
+| Legg til dato                | dateadd          |        :x:         |        :x:         |        :x:         |
+| År av en date                | year             |        :x:         |        :x:         |        :x:         |
+| Måned av en date             | month            |        :x:         |        :x:         |        :x:         |
+| Antall dager i året          | dayofyear        |        :x:         |        :x:         |        :x:         |
+| Antall dager i måneden       | dayofmonth       |        :x:         |        :x:         |        :x:         |
+| Konverter dager til år       | daytoyear        |        :x:         |        :x:         |        :x:         |
+| Konverter dager til måneder  | daytomonth       |        :x:         |        :x:         |        :x:         |
+| Konverter varighet i dager   | yeartoday        |        :x:         |        :x:         |        :x:         |
+| Konverter varighet i måneder | yeartomonth      |        :x:         |        :x:         |        :x:         |