From 67223f01f134c66fd5d63d5b71047274f1334447 Mon Sep 17 00:00:00 2001 From: thibaulttoujouse <119934984+thibaulttoujouse@users.noreply.github.com> Date: Wed, 21 Jan 2026 11:15:31 +0100 Subject: [PATCH 01/28] Create taxonomy New taxonomie file --- libraries/taxonomy | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 libraries/taxonomy diff --git a/libraries/taxonomy b/libraries/taxonomy new file mode 100644 index 00000000..f56db8b1 --- /dev/null +++ b/libraries/taxonomy @@ -0,0 +1,40 @@ +Taxonomie configuration : + +- id: my_taxonomy + +- category : + id : balance + required inputs : + variables : + - id : spillage + - id : unsupplied_energy + parameters : + - id : spillage_cost + - id : unsupplied_energy_cost + ports : + - id : balance_port + constraints : + - id : balance + outputs : + - id : operational_cost + properties : + - id : carrier + +id : production + required input : + variables : + - id : production + category : + - id : dispatchable production + - id : don-Dispatchable production + +id : consumption + category : + - id : fatal consumption + - id : flexible consumption + + id : storage + id : link + id : converter + id : coupling models + id : investment decisions From 38ffdd40d935f63da50bb4fcde78ce32a9805999 Mon Sep 17 00:00:00 2001 From: thibaulttoujouse <119934984+thibaulttoujouse@users.noreply.github.com> Date: Wed, 21 Jan 2026 14:25:29 +0100 Subject: [PATCH 02/28] Create ihm configuration ihm configuration --- libraries/ihm configuration | 68 +++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 libraries/ihm configuration diff --git a/libraries/ihm configuration b/libraries/ihm configuration new file mode 100644 index 00000000..5ec8cbe4 --- /dev/null +++ b/libraries/ihm configuration @@ -0,0 +1,68 @@ +id : ihm_configuration_1 + +taxonomy : my_taxonomy + +maps-interface : + visual graph node : + - taxonomy-category : balance + visual graph edge type 1 : + - taxonomy-category : link + visual graph edge type 2 : + - taxonomy-category : converter + +windows-interface : + id : node interface + hosted category : + - taxonomy-category : balance + primary filter : + - taxonomy-category : balance + + id : one-node connection models interface + hosted category : + - taxonomy-category : production + - taxonomy-category : consumption + - taxonomy-category : storage + host category : + - taxonomy-category : balance + connection : + - connection : connection 1 + primary filter : + - taxonomy-group : balance + connection filter : + - taxonomy-group : connection 1 + + id : edge type 1 interface + hosted category : + - taxonomy-category : link + host category : + - taxonomy-category : balance + connection : + - connection : connection 2 + primary filter : + - taxonomy-group : balance + connection filter : + - taxonomy-group : connection 2 + + id : edge type 2 interface + hosted category : + - taxonomy-category : converter + host category : + - taxonomy-category : balance + connection : + - connection : connection 2 + primary filter : + - taxonomy-group : balance + connection filter : + - taxonomy-group : connection 2 + + id : coupling interface + hosted category : + - taxonomy-category : Quota + host category : + - taxonomy-category : production + - taxonomy-category : consumption + - taxonomy-category : storage + connection : + - connection : connection 3 + - taxonomy-category : Flow-Based + From 658e8f328d1a5b436d2cdb6af755eec9b0a131b6 Mon Sep 17 00:00:00 2001 From: thibaulttoujouse <119934984+thibaulttoujouse@users.noreply.github.com> Date: Wed, 21 Jan 2026 14:25:59 +0100 Subject: [PATCH 03/28] Rename taxonomy to taxonomy configuration taxonomy configuration --- libraries/{taxonomy => taxonomy configuration} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename libraries/{taxonomy => taxonomy configuration} (100%) diff --git a/libraries/taxonomy b/libraries/taxonomy configuration similarity index 100% rename from libraries/taxonomy rename to libraries/taxonomy configuration From 14c425dcfaa516be8231f106072c6f3084f51689 Mon Sep 17 00:00:00 2001 From: thibaulttoujouse <119934984+thibaulttoujouse@users.noreply.github.com> Date: Wed, 21 Jan 2026 14:33:02 +0100 Subject: [PATCH 04/28] Update andromede_models.yml add properties required and taxonomy category --- libraries/andromede_models.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libraries/andromede_models.yml b/libraries/andromede_models.yml index 84b76e69..d0453a88 100644 --- a/libraries/andromede_models.yml +++ b/libraries/andromede_models.yml @@ -47,6 +47,11 @@ library: - port: balance_port field: flow definition: -load + taxonomy-category : load + properties required : + - id : carrier + - id : technology + - id: electrolyser @@ -74,3 +79,7 @@ library: - port: hydrogen_port field: flow definition: efficiency * power + taxonomy-category : converter + properties required : + - id : carrier + - id : technology From 705e22f48679caf3a78e90b9c931570f66d0f0f0 Mon Sep 17 00:00:00 2001 From: thibaulttoujouse <119934984+thibaulttoujouse@users.noreply.github.com> Date: Wed, 21 Jan 2026 14:42:06 +0100 Subject: [PATCH 05/28] Update taxonomy configuration Change name --- libraries/taxonomy configuration | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/taxonomy configuration b/libraries/taxonomy configuration index f56db8b1..6ca8d122 100644 --- a/libraries/taxonomy configuration +++ b/libraries/taxonomy configuration @@ -2,7 +2,7 @@ Taxonomie configuration : - id: my_taxonomy -- category : +- taxonomy-category : id : balance required inputs : variables : From b69907ed9271920c2499ed40aee2593b2454923b Mon Sep 17 00:00:00 2001 From: thibaulttoujouse <119934984+thibaulttoujouse@users.noreply.github.com> Date: Wed, 21 Jan 2026 14:47:09 +0100 Subject: [PATCH 06/28] Update ihm configuration indentation --- libraries/ihm configuration | 108 ++++++++++++++++++------------------ 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/libraries/ihm configuration b/libraries/ihm configuration index 5ec8cbe4..4a21d9d8 100644 --- a/libraries/ihm configuration +++ b/libraries/ihm configuration @@ -3,66 +3,66 @@ id : ihm_configuration_1 taxonomy : my_taxonomy maps-interface : - visual graph node : - - taxonomy-category : balance - visual graph edge type 1 : - - taxonomy-category : link + visual graph node : + - taxonomy-category : balance + visual graph edge type 1 : + - taxonomy-category : link visual graph edge type 2 : - - taxonomy-category : converter + - taxonomy-category : converter windows-interface : - id : node interface - hosted category : - - taxonomy-category : balance - primary filter : - - taxonomy-category : balance + id : node interface + hosted category : + - taxonomy-category : balance + primary filter : + - taxonomy-category : balance id : one-node connection models interface - hosted category : - - taxonomy-category : production - - taxonomy-category : consumption - - taxonomy-category : storage - host category : - - taxonomy-category : balance - connection : - - connection : connection 1 - primary filter : - - taxonomy-group : balance - connection filter : - - taxonomy-group : connection 1 + hosted category : + - taxonomy-category : production + - taxonomy-category : consumption + - taxonomy-category : storage + host category : + - taxonomy-category : balance + connection : + - connection : connection 1 + primary filter : + - taxonomy-group : balance + connection filter : + - taxonomy-group : connection 1 - id : edge type 1 interface - hosted category : - - taxonomy-category : link - host category : - - taxonomy-category : balance - connection : - - connection : connection 2 - primary filter : - - taxonomy-group : balance - connection filter : - - taxonomy-group : connection 2 + id : edge type 1 interface + hosted category : + - taxonomy-category : link + host category : + - taxonomy-category : balance + connection : + - connection : connection 2 + primary filter : + - taxonomy-group : balance + connection filter : + - taxonomy-group : connection 2 - id : edge type 2 interface - hosted category : - - taxonomy-category : converter - host category : - - taxonomy-category : balance - connection : - - connection : connection 2 - primary filter : - - taxonomy-group : balance - connection filter : - - taxonomy-group : connection 2 + id : edge type 2 interface + hosted category : + - taxonomy-category : converter + host category : + - taxonomy-category : balance + connection : + - connection : connection 2 + primary filter : + - taxonomy-group : balance + connection filter : + - taxonomy-group : connection 2 - id : coupling interface - hosted category : - - taxonomy-category : Quota - host category : - - taxonomy-category : production - - taxonomy-category : consumption - - taxonomy-category : storage - connection : - - connection : connection 3 - - taxonomy-category : Flow-Based + id : coupling interface + hosted category : + - taxonomy-category : Quota + host category : + - taxonomy-category : production + - taxonomy-category : consumption + - taxonomy-category : storage + connection : + - connection : connection 3 + - taxonomy-category : Flow-Based From d6cb2c2c342430fdb1d2313f8f18b6f7fd311e4f Mon Sep 17 00:00:00 2001 From: thibaulttoujouse <119934984+thibaulttoujouse@users.noreply.github.com> Date: Wed, 21 Jan 2026 14:55:07 +0100 Subject: [PATCH 07/28] Update ihm configuration new connections converter/link --- libraries/ihm configuration | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/libraries/ihm configuration b/libraries/ihm configuration index 4a21d9d8..0680f2ca 100644 --- a/libraries/ihm configuration +++ b/libraries/ihm configuration @@ -38,22 +38,31 @@ windows-interface : - taxonomy-category : balance connection : - connection : connection 2 + - taxonomy-category : balance + connection : + - connection : connection 2_bis primary filter : - taxonomy-group : balance connection filter : - taxonomy-group : connection 2 + - taxonomy-group : connection 2_bis + id : edge type 2 interface hosted category : - taxonomy-category : converter host category : - taxonomy-category : balance - connection : - - connection : connection 2 + connection : + - connection : connection 2 + - taxonomy-category : balance + connection : + - connection : connection 2_bis primary filter : - - taxonomy-group : balance + - taxonomy-group : balance connection filter : - - taxonomy-group : connection 2 + - taxonomy-group : connection 2 + - taxonomy-group : connection 2_bis id : coupling interface hosted category : From 5ede19d640e2f3962eee90350fd28c30ccddb5a7 Mon Sep 17 00:00:00 2001 From: thibaulttoujouse <119934984+thibaulttoujouse@users.noreply.github.com> Date: Wed, 21 Jan 2026 15:02:13 +0100 Subject: [PATCH 08/28] Create connections configuration new configuration for connections --- libraries/connections configuration | 65 +++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 libraries/connections configuration diff --git a/libraries/connections configuration b/libraries/connections configuration new file mode 100644 index 00000000..0dc98548 --- /dev/null +++ b/libraries/connections configuration @@ -0,0 +1,65 @@ + +id : my_connections + +taxonomy : my_taxonomy + +connections : + + - id : connection 1 + receiving category : + taxonomy-category : + - id : balance + ports : + - id : balance_port + emitting category : + taxonomy-category : + - id : production + - id : consumption + - id : storage + ports : + - id : balance_port + + - id : connection 2 + receiving category : + taxonomy-category : + - id : balance + ports : + - id : balance_port + emitting category : + taxonomy-category : + - id : link + - id : converter + ports : + - id : in_port + + - id : connection 3 + receiving category : + taxonomy-category : + - id : balance + ports : + - id : balance_port + emitting category : + taxonomy-category : + - id : link + - id : converter + ports : + - id : out_port + + - id : connection 4 + receiving category : + taxonomy-category : + - id : quota + ports : + - id : emissions + emitting category : + taxonomy-category : + - id : production + - id : consumption + - id : storage + ports : + - id : emissions + + + + + From 159e6dd5c4dc093b2980eeb1c0668866f74275f1 Mon Sep 17 00:00:00 2001 From: thibaulttoujouse <119934984+thibaulttoujouse@users.noreply.github.com> Date: Wed, 21 Jan 2026 15:22:40 +0100 Subject: [PATCH 09/28] Update connections configuration new name id connection --- libraries/connections configuration | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/connections configuration b/libraries/connections configuration index 0dc98548..b74ccfa3 100644 --- a/libraries/connections configuration +++ b/libraries/connections configuration @@ -32,7 +32,7 @@ connections : ports : - id : in_port - - id : connection 3 + - id : connection 2_bis receiving category : taxonomy-category : - id : balance From bb54ef003ea9d9ab37aa4ca04799ea6439b15f6d Mon Sep 17 00:00:00 2001 From: thibaulttoujouse <119934984+thibaulttoujouse@users.noreply.github.com> Date: Wed, 21 Jan 2026 15:23:19 +0100 Subject: [PATCH 10/28] Update ihm configuration new indentation --- libraries/ihm configuration | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/libraries/ihm configuration b/libraries/ihm configuration index 0680f2ca..4d143ad6 100644 --- a/libraries/ihm configuration +++ b/libraries/ihm configuration @@ -7,7 +7,7 @@ maps-interface : - taxonomy-category : balance visual graph edge type 1 : - taxonomy-category : link - visual graph edge type 2 : + visual graph edge type 2 : - taxonomy-category : converter windows-interface : @@ -15,7 +15,7 @@ windows-interface : hosted category : - taxonomy-category : balance primary filter : - - taxonomy-category : balance + - taxonomy-category : balance id : one-node connection models interface hosted category : @@ -23,9 +23,9 @@ windows-interface : - taxonomy-category : consumption - taxonomy-category : storage host category : - - taxonomy-category : balance - connection : - - connection : connection 1 + - taxonomy-category : balance + connection : + - connection : connection 1 primary filter : - taxonomy-group : balance connection filter : @@ -44,9 +44,8 @@ windows-interface : primary filter : - taxonomy-group : balance connection filter : - - taxonomy-group : connection 2 - - taxonomy-group : connection 2_bis - + - connection : connection 2 + - connection : connection 2_bis id : edge type 2 interface hosted category : @@ -61,8 +60,8 @@ windows-interface : primary filter : - taxonomy-group : balance connection filter : - - taxonomy-group : connection 2 - - taxonomy-group : connection 2_bis + - connection : connection 2 + - connection : connection 2_bis id : coupling interface hosted category : From 20c81f17bca71d77455b2eb9083a1d276fb42f2a Mon Sep 17 00:00:00 2001 From: thibaulttoujouse <119934984+thibaulttoujouse@users.noreply.github.com> Date: Wed, 21 Jan 2026 15:41:40 +0100 Subject: [PATCH 11/28] Create configuration files --- configuration files | 1 + 1 file changed, 1 insertion(+) create mode 100644 configuration files diff --git a/configuration files b/configuration files new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/configuration files @@ -0,0 +1 @@ + From 971fb5f6d909061d8ba6787c667a29235bd07fcf Mon Sep 17 00:00:00 2001 From: Thomas Bittar Date: Wed, 21 Jan 2026 16:37:48 +0100 Subject: [PATCH 12/28] Reorganize config files --- configuration files | 1 - .../connections configuration.yml | 0 .../ihm configuration => gui-configuration/ihm configuration.yml | 0 .../taxonomy configuration.yml | 0 4 files changed, 1 deletion(-) delete mode 100644 configuration files rename libraries/connections configuration => gui-configuration/connections configuration.yml (100%) rename libraries/ihm configuration => gui-configuration/ihm configuration.yml (100%) rename libraries/taxonomy configuration => taxonomies/taxonomy configuration.yml (100%) diff --git a/configuration files b/configuration files deleted file mode 100644 index 8b137891..00000000 --- a/configuration files +++ /dev/null @@ -1 +0,0 @@ - diff --git a/libraries/connections configuration b/gui-configuration/connections configuration.yml similarity index 100% rename from libraries/connections configuration rename to gui-configuration/connections configuration.yml diff --git a/libraries/ihm configuration b/gui-configuration/ihm configuration.yml similarity index 100% rename from libraries/ihm configuration rename to gui-configuration/ihm configuration.yml diff --git a/libraries/taxonomy configuration b/taxonomies/taxonomy configuration.yml similarity index 100% rename from libraries/taxonomy configuration rename to taxonomies/taxonomy configuration.yml From fef2815867ab4d6051d864fe23485f37caf3e693 Mon Sep 17 00:00:00 2001 From: thibaulttoujouse <119934984+thibaulttoujouse@users.noreply.github.com> Date: Wed, 21 Jan 2026 17:38:31 +0100 Subject: [PATCH 13/28] Update ihm configuration.yml --- gui-configuration/ihm configuration.yml | 72 +++++++++++++------------ 1 file changed, 39 insertions(+), 33 deletions(-) diff --git a/gui-configuration/ihm configuration.yml b/gui-configuration/ihm configuration.yml index 4d143ad6..93d8e792 100644 --- a/gui-configuration/ihm configuration.yml +++ b/gui-configuration/ihm configuration.yml @@ -5,72 +5,78 @@ taxonomy : my_taxonomy maps-interface : visual graph node : - taxonomy-category : balance + - instantiation : true visual graph edge type 1 : - taxonomy-category : link + - instantiation : true visual graph edge type 2 : - taxonomy-category : converter + - instantiation : true + windows-interface : id : node interface - hosted category : + displayed category : - taxonomy-category : balance - primary filter : + locational category : - taxonomy-category : balance + locational filter : + - taxonomy-group : balance id : one-node connection models interface - hosted category : + displayed category : - taxonomy-category : production - taxonomy-category : consumption - taxonomy-category : storage - host category : - - taxonomy-category : balance - connection : - - connection : connection 1 - primary filter : + locational category : - taxonomy-group : balance - connection filter : + connection : - taxonomy-group : connection 1 + locational filter : + - taxonomy-group : balance + connection filter : + - connection : connection 1 id : edge type 1 interface - hosted category : + displayed category : - taxonomy-category : link - host category : - - taxonomy-category : balance - connection : - - connection : connection 2 - - taxonomy-category : balance - connection : - - connection : connection 2_bis - primary filter : + locational category : - taxonomy-group : balance - connection filter : + connection : - connection : connection 2 + - taxonomy-group : balance + connection : - connection : connection 2_bis + locational filter : + - taxonomy-group : balance + connection filter : # pour chaque noeud, on vérifie si un lien est connecté par connection2 ou connection 2_bis + - connection : connection 2 + - connection : connection 2_bis id : edge type 2 interface - hosted category : + displayed category : - taxonomy-category : converter - host category : - - taxonomy-category : balance - connection : - - connection : connection 2 - - taxonomy-category : balance - connection : - - connection : connection 2_bis - primary filter : + locational category : - taxonomy-group : balance - connection filter : + connection : - connection : connection 2 + - taxonomy-group : balance + connection : - connection : connection 2_bis + locational filter : + - taxonomy-group : balance + connection filter : # pour chaque noeud, on vérifie si un lien est connecté par connection2 ou connection 2_bis + - connection : connection 2 + - connection : connection 2_bis id : coupling interface - hosted category : + displayed category : - taxonomy-category : Quota - host category : + locational category : - taxonomy-category : production - taxonomy-category : consumption - taxonomy-category : storage connection : - connection : connection 3 - - taxonomy-category : Flow-Based - + + From 1f259ffb4c6442dc99a2e8d65753d0d441d629ee Mon Sep 17 00:00:00 2001 From: thibaulttoujouse <119934984+thibaulttoujouse@users.noreply.github.com> Date: Wed, 21 Jan 2026 17:40:23 +0100 Subject: [PATCH 14/28] Update connections configuration.yml --- gui-configuration/connections configuration.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gui-configuration/connections configuration.yml b/gui-configuration/connections configuration.yml index b74ccfa3..8633f657 100644 --- a/gui-configuration/connections configuration.yml +++ b/gui-configuration/connections configuration.yml @@ -6,12 +6,12 @@ taxonomy : my_taxonomy connections : - id : connection 1 - receiving category : + category 1: taxonomy-category : - id : balance ports : - id : balance_port - emitting category : + category 2 : taxonomy-category : - id : production - id : consumption @@ -20,12 +20,12 @@ connections : - id : balance_port - id : connection 2 - receiving category : + category 1 : taxonomy-category : - id : balance ports : - id : balance_port - emitting category : + category 2 : taxonomy-category : - id : link - id : converter @@ -33,12 +33,12 @@ connections : - id : in_port - id : connection 2_bis - receiving category : + category 1 : taxonomy-category : - id : balance ports : - id : balance_port - emitting category : + category 2 : taxonomy-category : - id : link - id : converter @@ -46,12 +46,12 @@ connections : - id : out_port - id : connection 4 - receiving category : + category 1 : taxonomy-category : - id : quota ports : - id : emissions - emitting category : + category 2 : taxonomy-category : - id : production - id : consumption From 879d3a74a4eae8bb3823713dc6cc09df9652a109 Mon Sep 17 00:00:00 2001 From: OUSTRY Antoine Date: Tue, 24 Feb 2026 16:44:19 +0100 Subject: [PATCH 15/28] restructure taxonomy --- taxonomies/taxonomy configuration.yml | 40 ------------- taxonomies/taxonomy_example.yml | 81 +++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 40 deletions(-) delete mode 100644 taxonomies/taxonomy configuration.yml create mode 100644 taxonomies/taxonomy_example.yml diff --git a/taxonomies/taxonomy configuration.yml b/taxonomies/taxonomy configuration.yml deleted file mode 100644 index 6ca8d122..00000000 --- a/taxonomies/taxonomy configuration.yml +++ /dev/null @@ -1,40 +0,0 @@ -Taxonomie configuration : - -- id: my_taxonomy - -- taxonomy-category : - id : balance - required inputs : - variables : - - id : spillage - - id : unsupplied_energy - parameters : - - id : spillage_cost - - id : unsupplied_energy_cost - ports : - - id : balance_port - constraints : - - id : balance - outputs : - - id : operational_cost - properties : - - id : carrier - -id : production - required input : - variables : - - id : production - category : - - id : dispatchable production - - id : don-Dispatchable production - -id : consumption - category : - - id : fatal consumption - - id : flexible consumption - - id : storage - id : link - id : converter - id : coupling models - id : investment decisions diff --git a/taxonomies/taxonomy_example.yml b/taxonomies/taxonomy_example.yml new file mode 100644 index 00000000..5710c90c --- /dev/null +++ b/taxonomies/taxonomy_example.yml @@ -0,0 +1,81 @@ +# Copyright (c) 2024, RTE (https://www.rte-france.com) +# +# See AUTHORS.txt +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# SPDX-License-Identifier: MPL-2.0 +# +# This file is part of the Antares project. + +taxonomy: + id: my_taxonomy + description: "GEMS taxonomy configuration. This is an example to illustrate the data structure of a taxonomy configuration file. It is not meant to be used as is. + + categories: + + - id: balance + ports: + - id: balance_port + constraints: + - id: balance + extra-outputs: + - id: price + properties: + - id: carrier + + - id: production + + parameters: + - id: p_min + - id: p_max + - id: generation_cost + ports: + - id: balance_port + properties: + - id: carrier + - id: technology + extra-outputs: + - id: up_margin + - id: down_margin + + - id: dispatchable_production + parent-category: production + variables: # just an example of how to use variables in a category + - id: generation + + - id: fatal_production + parent-category: production + parameters: + - id: generation + + - id: consumption + ports: + - id: balance_port + properties: + - id: carrier + + - id: fatal_consumption + parent-category: consumption + + - id: flexible_consumption + parent-category: consumption + parameters: + - id: min_load + - id: max_load + + + - id: storage + + + - id: link + + - id: converter + + - id: coupling_models + + - id: capacity_investment_decisions + ports: + - id: capacity_port \ No newline at end of file From d7c9c56f6d20b56d6f3efb756fc5ab94752a7d35 Mon Sep 17 00:00:00 2001 From: OUSTRY Antoine Date: Tue, 24 Feb 2026 16:45:26 +0100 Subject: [PATCH 16/28] restructure taxonomy --- taxonomies/taxonomy_example.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taxonomies/taxonomy_example.yml b/taxonomies/taxonomy_example.yml index 5710c90c..052beaea 100644 --- a/taxonomies/taxonomy_example.yml +++ b/taxonomies/taxonomy_example.yml @@ -12,7 +12,7 @@ taxonomy: id: my_taxonomy - description: "GEMS taxonomy configuration. This is an example to illustrate the data structure of a taxonomy configuration file. It is not meant to be used as is. + description: GEMS taxonomy configuration. This is an example to illustrate the data structure of a taxonomy configuration file. It is not meant to be used as is. categories: From 18917c8294fc7fdb5d56340be27f999f977fdddf Mon Sep 17 00:00:00 2001 From: OUSTRY Antoine Date: Tue, 24 Feb 2026 17:13:59 +0100 Subject: [PATCH 17/28] add fields --- taxonomies/taxonomy_example.yml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/taxonomies/taxonomy_example.yml b/taxonomies/taxonomy_example.yml index 052beaea..607b7208 100644 --- a/taxonomies/taxonomy_example.yml +++ b/taxonomies/taxonomy_example.yml @@ -17,21 +17,24 @@ taxonomy: categories: - id: balance + variables: + - id: unsupplied_energy + - id: spilled_energy ports: - id: balance_port constraints: - id: balance extra-outputs: - id: price + - id: imbalance_cost + - id: is_loss_of_load properties: - id: carrier - id: production parameters: - - id: p_min - - id: p_max - - id: generation_cost + - id: total_p_max ports: - id: balance_port properties: @@ -45,6 +48,10 @@ taxonomy: parent-category: production variables: # just an example of how to use variables in a category - id: generation + extra-outputs: + - id: proportional_cost + - id: non_proportional_cost + - id: nb_units_on - id: fatal_production parent-category: production @@ -52,6 +59,8 @@ taxonomy: - id: generation - id: consumption + extra-outputs: + - id: withdrawal ports: - id: balance_port properties: @@ -71,6 +80,9 @@ taxonomy: - id: link + ports: + - id: out_port + - id: in_port - id: converter From 2e8a0521dde89223c638a07d3e58f0de9be8cecb Mon Sep 17 00:00:00 2001 From: "Antoine Oustry, PhD" <58943406+aoustry@users.noreply.github.com> Date: Tue, 24 Feb 2026 17:18:55 +0100 Subject: [PATCH 18/28] Refactor taxonomy categories and properties in YAML Updated taxonomy categories and corrected formatting in the andromede_models.yml file. --- libraries/andromede_models.yml | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/libraries/andromede_models.yml b/libraries/andromede_models.yml index d0453a88..ec7be8ec 100644 --- a/libraries/andromede_models.yml +++ b/libraries/andromede_models.yml @@ -22,16 +22,17 @@ library: models: - id: flexible_load + taxonomy-category: consumption parameters: - - id: min_load - time-dependent: true - scenario-dependent: true - - id: max_load - time-dependent: true - scenario-dependent: true - - id: marginal_flexibility_cost - time-dependent: false - scenario-dependent: false + - id: min_load + time-dependent: true + scenario-dependent: true + - id: max_load + time-dependent: true + scenario-dependent: true + - id: marginal_flexibility_cost + time-dependent: false + scenario-dependent: false variables: - id: load lower-bound: min_load @@ -47,14 +48,14 @@ library: - port: balance_port field: flow definition: -load - taxonomy-category : load - properties required : + properties: - id : carrier - id : technology - id: electrolyser + taxonomy-category: converter parameters: - id: efficiency scenario-dependent: false @@ -79,7 +80,3 @@ library: - port: hydrogen_port field: flow definition: efficiency * power - taxonomy-category : converter - properties required : - - id : carrier - - id : technology From e583d47f7d203ef9d10d45a3517b18f2048bc8c4 Mon Sep 17 00:00:00 2001 From: "Antoine Oustry, PhD" <58943406+aoustry@users.noreply.github.com> Date: Tue, 24 Feb 2026 17:48:50 +0100 Subject: [PATCH 19/28] Update ihm configuration.yml with new taxonomy settings --- ihm configuration.yml | 82 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 ihm configuration.yml diff --git a/ihm configuration.yml b/ihm configuration.yml new file mode 100644 index 00000000..4736e923 --- /dev/null +++ b/ihm configuration.yml @@ -0,0 +1,82 @@ +id: ihm_configuration_1 + +taxonomy: my_taxonomy + +maps-interface: + visual graph node: + - taxonomy-category: balance + - instantiation: true + visual graph edge type 1: + - taxonomy-category: link + - instantiation: true + visual graph edge type 2: + - taxonomy-category: converter + - instantiation: true + +windows-interface: + node interface: + id: node interface + displayed-category: + - taxonomy-category: balance + locational-category: + - taxonomy-category: balance + locational-filter: + - taxonomy-group: balance + + one-node connection models interface: + id: one-node connection models interface + displayed-category: + - taxonomy-category: production + - taxonomy-category: consumption + - taxonomy-category: storage + locational-category: + - taxonomy-group: balance + connections: + - taxonomy-group: connection 1 + locational-filter: + - taxonomy-group: balance + connection-filter: + - connection: connection 1 + + edge type 1 interface: + id: edge type 1 interface + displayed-category: + - taxonomy-category: link + locational-category: + - taxonomy-group: balance + connections: + - connection: connection 2 + - taxonomy-group: balance + - connection: connection 2_bis + locational-filter: + - taxonomy-group: balance + connection-filter: + - connection: connection 2 + - connection: connection 2_bis + + edge type 2 interface: + id: edge type 2 interface + displayed-category: + - taxonomy-category: converter + locational-category: + - taxonomy-group: balance + connections: + - connection: connection 2 + - taxonomy-group: balance + - connection: connection 2_bis + locational-filter: + - taxonomy-group: balance + connection-filter: + - connection: connection 2 + - connection: connection 2_bis + + coupling interface: + id: coupling interface + displayed-category: + - taxonomy-category: Quota + locational-category: + - taxonomy-category: production + - taxonomy-category: consumption + - taxonomy-category: storage + connections: + - connection: connection 3 \ No newline at end of file From 1a9a8d69487247f637819d4f57e987e9a1170ec4 Mon Sep 17 00:00:00 2001 From: "Antoine Oustry, PhD" <58943406+aoustry@users.noreply.github.com> Date: Tue, 24 Feb 2026 18:01:45 +0100 Subject: [PATCH 20/28] Refactor YAML structure for GUI configuration --- gui-configuration/ihm configuration.yml | 117 ++++++++++++------------ 1 file changed, 56 insertions(+), 61 deletions(-) diff --git a/gui-configuration/ihm configuration.yml b/gui-configuration/ihm configuration.yml index 93d8e792..edeb5520 100644 --- a/gui-configuration/ihm configuration.yml +++ b/gui-configuration/ihm configuration.yml @@ -2,81 +2,76 @@ id : ihm_configuration_1 taxonomy : my_taxonomy -maps-interface : - visual graph node : +maps-interface: + visual_graph_nodes: - taxonomy-category : balance - instantiation : true - visual graph edge type 1 : - - taxonomy-category : link - - instantiation : true - visual graph edge type 2 : - - taxonomy-category : converter - - instantiation : true + visual_graph_edge_types: + - id: type_1 + taxonomy-category : link + instantiation : true + - id: type_2 + taxonomy-category : converter + instantiation : true -windows-interface : - id : node interface - displayed category : +windows-interfaces: + - id: node_window + displayed-category : - taxonomy-category : balance - locational category : + locational-category : - taxonomy-category : balance - locational filter : + locational-filter : - taxonomy-group : balance - id : one-node connection models interface - displayed category : - - taxonomy-category : production - - taxonomy-category : consumption - - taxonomy-category : storage - locational category : - - taxonomy-group : balance - connection : - - taxonomy-group : connection 1 - locational filter : - - taxonomy-group : balance - connection filter : - - connection : connection 1 + - id: one_node_content_window + displayed-category : + - taxonomy-category: production + - taxonomy-category: consumption + - taxonomy-category: storage + locational-category : + - taxonomy-category: balance + connection: connection_1 + locational-filter : + - taxonomy-category : balance + connection-filter: + - connection: connection_2 - id : edge type 1 interface - displayed category : + - id: edge_window_link + displayed-category : - taxonomy-category : link - locational category : - - taxonomy-group : balance - connection : - - connection : connection 2 - - taxonomy-group : balance - connection : - - connection : connection 2_bis - locational filter : - - taxonomy-group : balance - connection filter : # pour chaque noeud, on vérifie si un lien est connecté par connection2 ou connection 2_bis - - connection : connection 2 - - connection : connection 2_bis + locational-category : + - taxonomy-category : balance + connection: connection_2 + - taxonomy-category : balance + connection: connection_2_bis + locational-filter : + - taxonomy-category : balance + connection-filter : # pour chaque noeud, on vérifie si un lien est connecté par connection2 ou connection 2_bis + - connection : connection_2 + - connection : connection_2_bis - id : edge type 2 interface - displayed category : - - taxonomy-category : converter - locational category : - - taxonomy-group : balance - connection : - - connection : connection 2 - - taxonomy-group : balance - connection : - - connection : connection 2_bis - locational filter : - - taxonomy-group : balance - connection filter : # pour chaque noeud, on vérifie si un lien est connecté par connection2 ou connection 2_bis - - connection : connection 2 - - connection : connection 2_bis + - id : edge_window_converter + displayed-category: + - taxonomy-category: converter + locational-category: + - taxonomy-category: balance + connection: connection_2 + - taxonomy-category : balance + connection: connection_2_bis + locational-filter: + - taxonomy-category: balance + connection-filter : # pour chaque noeud, on vérifie si un lien est connecté par connection2 ou connection 2_bis + - connection : connection_2 + - connection : connection_2_bis - id : coupling interface - displayed category : - - taxonomy-category : Quota - locational category : + - id: coupling_objects_window + displayed-category : + - taxonomy-category : coupling + locational-category : - taxonomy-category : production - taxonomy-category : consumption - taxonomy-category : storage - connection : - - connection : connection 3 + connection: connection_3 From 224ebcf2a375e7b30dab2143d6f93e5a9e77a01b Mon Sep 17 00:00:00 2001 From: "Antoine Oustry, PhD" <58943406+aoustry@users.noreply.github.com> Date: Tue, 24 Feb 2026 18:10:00 +0100 Subject: [PATCH 21/28] Update ihm configuration.yml --- gui-configuration/ihm configuration.yml | 133 ++++++++++++------------ 1 file changed, 65 insertions(+), 68 deletions(-) diff --git a/gui-configuration/ihm configuration.yml b/gui-configuration/ihm configuration.yml index edeb5520..0d6e8af5 100644 --- a/gui-configuration/ihm configuration.yml +++ b/gui-configuration/ihm configuration.yml @@ -1,77 +1,74 @@ -id : ihm_configuration_1 +id: ihm_configuration_1 -taxonomy : my_taxonomy +taxonomy: my_taxonomy maps-interface: - visual_graph_nodes: - - taxonomy-category : balance - - instantiation : true - visual_graph_edge_types: - - id: type_1 - taxonomy-category : link - instantiation : true - - id: type_2 - taxonomy-category : converter - instantiation : true - + visual_graph_nodes: + - taxonomy-category: balance + - instantiation: true + visual_graph_edge_types: + - id: type_1 + taxonomy-category: link + instantiation: true + - id: type_2 + taxonomy-category: converter + instantiation: true windows-interfaces: - - id: node_window - displayed-category : - - taxonomy-category : balance - locational-category : - - taxonomy-category : balance - locational-filter : - - taxonomy-group : balance - - - id: one_node_content_window - displayed-category : - - taxonomy-category: production - - taxonomy-category: consumption - - taxonomy-category: storage - locational-category : - - taxonomy-category: balance - connection: connection_1 - locational-filter : - - taxonomy-category : balance - connection-filter: - - connection: connection_2 - - - id: edge_window_link - displayed-category : - - taxonomy-category : link - locational-category : - - taxonomy-category : balance - connection: connection_2 - - taxonomy-category : balance - connection: connection_2_bis - locational-filter : - - taxonomy-category : balance - connection-filter : # pour chaque noeud, on vérifie si un lien est connecté par connection2 ou connection 2_bis - - connection : connection_2 - - connection : connection_2_bis + - id: node_window + displayed-category: + - taxonomy-category: balance + locational-category: + - taxonomy-category: balance + locational-filter: + - taxonomy-group: balance - - id : edge_window_converter - displayed-category: - - taxonomy-category: converter - locational-category: - - taxonomy-category: balance - connection: connection_2 - - taxonomy-category : balance - connection: connection_2_bis - locational-filter: - - taxonomy-category: balance - connection-filter : # pour chaque noeud, on vérifie si un lien est connecté par connection2 ou connection 2_bis - - connection : connection_2 - - connection : connection_2_bis + - id: one_node_content_window + displayed-category: + - taxonomy-category: production + - taxonomy-category: consumption + - taxonomy-category: storage + locational-category: + - taxonomy-category: balance + connection: connection_1 + locational-filter: + - taxonomy-category: balance + connection-filter: + - connection: connection_2 - - id: coupling_objects_window - displayed-category : - - taxonomy-category : coupling - locational-category : - - taxonomy-category : production - - taxonomy-category : consumption - - taxonomy-category : storage - connection: connection_3 + - id: edge_window_link + displayed-category: + - taxonomy-category: link + locational-category: + - taxonomy-category: balance + connection: connection_2 + - taxonomy-category: balance + connection: connection_2_bis + locational-filter: + - taxonomy-category: balance + connection-filter: # pour chaque noeud, on vérifie si un lien est connecté par connection2 ou connection 2_bis + - connection: connection_2 + - connection: connection_2_bis + - id: edge_window_converter + displayed-category: + - taxonomy-category: converter + locational-category: + - taxonomy-category: balance + connection: connection_2 + - taxonomy-category: balance + connection: connection_2_bis + locational-filter: + - taxonomy-category: balance + connection-filter: # pour chaque noeud, on vérifie si un lien est connecté par connection2 ou connection 2_bis + - connection: connection_2 + - connection: connection_2_bis + - id: coupling_objects_window + displayed-category: + - taxonomy-category: coupling + locational-category: + - taxonomy-category: production + - taxonomy-category: consumption + - taxonomy-category: storage + connection: connection_3 From e2cf1c022462e9ebc125d074f297d4e4cd78df11 Mon Sep 17 00:00:00 2001 From: "Antoine Oustry, PhD" <58943406+aoustry@users.noreply.github.com> Date: Tue, 24 Feb 2026 18:12:55 +0100 Subject: [PATCH 22/28] Update ihm configuration.yml --- gui-configuration/ihm configuration.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gui-configuration/ihm configuration.yml b/gui-configuration/ihm configuration.yml index 0d6e8af5..444b8071 100644 --- a/gui-configuration/ihm configuration.yml +++ b/gui-configuration/ihm configuration.yml @@ -3,16 +3,16 @@ id: ihm_configuration_1 taxonomy: my_taxonomy maps-interface: - visual_graph_nodes: + visual-graph-nodes: - taxonomy-category: balance - - instantiation: true - visual_graph_edge_types: + - instantiation: true #TO DO : one option could be to refer to the windows-interface id + visual-graph-edge-types: - id: type_1 taxonomy-category: link - instantiation: true + instantiation: true #TO DO : one option could be to refer to the windows-interface id - id: type_2 taxonomy-category: converter - instantiation: true + instantiation: true #TO DO : one option could be to refer to the windows-interface id windows-interfaces: - id: node_window @@ -71,4 +71,4 @@ windows-interfaces: - taxonomy-category: production - taxonomy-category: consumption - taxonomy-category: storage - connection: connection_3 + connection: connection_3 # the syntax differs from above From c7470812c08e292d3a83f99c975f24ecbb8a7ab0 Mon Sep 17 00:00:00 2001 From: "Antoine Oustry, PhD" <58943406+aoustry@users.noreply.github.com> Date: Tue, 24 Feb 2026 18:15:20 +0100 Subject: [PATCH 23/28] Update ihm configuration.yml --- gui-configuration/ihm configuration.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gui-configuration/ihm configuration.yml b/gui-configuration/ihm configuration.yml index 444b8071..51940d76 100644 --- a/gui-configuration/ihm configuration.yml +++ b/gui-configuration/ihm configuration.yml @@ -2,6 +2,11 @@ id: ihm_configuration_1 taxonomy: my_taxonomy +#TO DO : open questions +## Instantiation -> mention a window id ? Link with the "displayed category" ? +## How do reflect the fact that one_node_content_window is not at the same level than node_window ? +## Syntax for locational filter and locational category should be refined + maps-interface: visual-graph-nodes: - taxonomy-category: balance From 38d44ae3eb359379306681ecc70dd11e4fa7fa43 Mon Sep 17 00:00:00 2001 From: "Antoine Oustry, PhD" <58943406+aoustry@users.noreply.github.com> Date: Tue, 24 Feb 2026 18:16:41 +0100 Subject: [PATCH 24/28] Update ihm configuration.yml --- gui-configuration/ihm configuration.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/gui-configuration/ihm configuration.yml b/gui-configuration/ihm configuration.yml index 51940d76..67c1394e 100644 --- a/gui-configuration/ihm configuration.yml +++ b/gui-configuration/ihm configuration.yml @@ -6,6 +6,7 @@ taxonomy: my_taxonomy ## Instantiation -> mention a window id ? Link with the "displayed category" ? ## How do reflect the fact that one_node_content_window is not at the same level than node_window ? ## Syntax for locational filter and locational category should be refined +## Is there really a need to define "connections", in another file? maps-interface: visual-graph-nodes: From 9c9086988e551abd7c03d0d20afde478b9a85d5b Mon Sep 17 00:00:00 2001 From: "Antoine Oustry, PhD" <58943406+aoustry@users.noreply.github.com> Date: Tue, 24 Feb 2026 18:18:10 +0100 Subject: [PATCH 25/28] Update taxonomy_example.yml --- taxonomies/taxonomy_example.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/taxonomies/taxonomy_example.yml b/taxonomies/taxonomy_example.yml index 607b7208..c6007b3d 100644 --- a/taxonomies/taxonomy_example.yml +++ b/taxonomies/taxonomy_example.yml @@ -77,7 +77,7 @@ taxonomy: - id: storage - + # To be continued - id: link ports: @@ -90,4 +90,4 @@ taxonomy: - id: capacity_investment_decisions ports: - - id: capacity_port \ No newline at end of file + - id: capacity_port From 5cc6b73fbf7956c06db55e3909880f7086ca4386 Mon Sep 17 00:00:00 2001 From: "Antoine Oustry, PhD" <58943406+aoustry@users.noreply.github.com> Date: Tue, 24 Feb 2026 18:23:27 +0100 Subject: [PATCH 26/28] Update taxonomy_example.yml --- taxonomies/taxonomy_example.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/taxonomies/taxonomy_example.yml b/taxonomies/taxonomy_example.yml index c6007b3d..2834db35 100644 --- a/taxonomies/taxonomy_example.yml +++ b/taxonomies/taxonomy_example.yml @@ -32,7 +32,6 @@ taxonomy: - id: carrier - id: production - parameters: - id: total_p_max ports: @@ -85,6 +84,9 @@ taxonomy: - id: in_port - id: converter + ports: + - id: out_port + - id: in_port - id: coupling_models From b0b5419124cd4b773e43605792f6ae914ca07748 Mon Sep 17 00:00:00 2001 From: "Antoine Oustry, PhD" <58943406+aoustry@users.noreply.github.com> Date: Fri, 27 Feb 2026 14:40:17 +0100 Subject: [PATCH 27/28] Update ihm configuration.yml --- gui-configuration/ihm configuration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui-configuration/ihm configuration.yml b/gui-configuration/ihm configuration.yml index 67c1394e..60bf64ca 100644 --- a/gui-configuration/ihm configuration.yml +++ b/gui-configuration/ihm configuration.yml @@ -11,7 +11,7 @@ taxonomy: my_taxonomy maps-interface: visual-graph-nodes: - taxonomy-category: balance - - instantiation: true #TO DO : one option could be to refer to the windows-interface id + instantiation: true #TO DO : one option could be to refer to the windows-interface id visual-graph-edge-types: - id: type_1 taxonomy-category: link From 3f89ce090d6049d96e32cf6dcd836508040784e0 Mon Sep 17 00:00:00 2001 From: "Antoine Oustry, PhD" <58943406+aoustry@users.noreply.github.com> Date: Fri, 27 Feb 2026 14:40:36 +0100 Subject: [PATCH 28/28] Update ihm configuration.yml --- gui-configuration/ihm configuration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui-configuration/ihm configuration.yml b/gui-configuration/ihm configuration.yml index 60bf64ca..2b19cd65 100644 --- a/gui-configuration/ihm configuration.yml +++ b/gui-configuration/ihm configuration.yml @@ -27,7 +27,7 @@ windows-interfaces: locational-category: - taxonomy-category: balance locational-filter: - - taxonomy-group: balance + - taxonomy-category: balance - id: one_node_content_window displayed-category: