More robust UCTE naming strategy #3206

clementleclercRTE · 2024-11-12T08:22:43Z

Please check if the PR fulfills these requirements

The commit message follows our guidelines
Tests for the changes have been added (for bug fixes / features)
Docs have been added / updated (for bug fixes / features)

Does this PR already have an issue describing the problem?

Fixes #3191

What kind of change does this PR introduce?

What is the current behavior?

What is the new behavior (if this is a feature change)?

Does this PR introduce a breaking change or deprecate an API?

Yes
No

If yes, please check if the following requirements are fulfilled

The Breaking Change or Deprecated label has been added
The migration steps are described in the following section

What changes might users need to make in their application due to this PR? (migration steps)

If you have a custom UCTE naming strategy (i.e. a class implementing com.powsybl.ucte.converter.NamingStrategy), you should implement the following method:

void initializeNetwork(Network network);

Other information:

By default, the "Default" naming strategy is used when exporting a network in UCTE.
If you want to use the new naming strategy, you should define the following property in your configuration:

ucte.export.naming-strategy: Counter

Signed-off-by: Leclerc Clement <[email protected]>

ucte/ucte-converter/src/main/java/com/powsybl/ucte/converter/CounterNamingStrategy.java

Signed-off-by: Leclerc Clement <[email protected]>

Signed-off-by: clementleclerc <[email protected]>

ucte/ucte-converter/src/main/java/com/powsybl/ucte/converter/CounterNamingStrategy.java

ucte/ucte-converter/src/main/java/com/powsybl/ucte/converter/DefaultNamingStrategy.java

ucte/ucte-converter/src/test/java/com/powsybl/ucte/converter/CounterNamingStrategyTest.java

ucte/ucte-converter/src/main/java/com/powsybl/ucte/converter/UcteExporter.java

Signed-off-by: Leclerc Clement <[email protected]>

…into 3191-conversion-to-ucte-format

Signed-off-by: Leclerc Clement <[email protected]>

ucte/ucte-network/src/main/java/com/powsybl/ucte/network/UcteElementId.java

ucte/ucte-converter/src/main/java/com/powsybl/ucte/converter/util/UcteConstants.java

ucte/ucte-converter/src/main/java/com/powsybl/ucte/converter/NamingStrategy.java

ucte/ucte-converter/src/main/java/com/powsybl/ucte/converter/CounterNamingStrategy.java

olperr1 · 2024-12-04T09:55:20Z

ucte/ucte-converter/src/main/java/com/powsybl/ucte/converter/CounterNamingStrategy.java

+    }
+
+    private UcteNodeCode createNewUcteNodeId(String busId, VoltageLevel voltageLevel, char orderCode) {
+        String newNodeId = String.format("%05d", voltageLevelCounter);


Maybe we can use [A-Z0-9] codes instead?
We could convert the number in base 36, but I think it would be better to have the letters first instead of the digits.
(=> AAAAA to AAAAZ, AAAA0 to AAAA9, then AAAABA...)

(But it is not required.)

With numbers is ok for now. Let's see that later if one day needed.

ucte/ucte-network/src/main/java/com/powsybl/ucte/network/UcteCountryCode.java

Signed-off-by: Leclerc Clement <[email protected]>

ucte/ucte-converter/src/main/java/com/powsybl/ucte/converter/AbstractNamingStrategy.java

ucte/ucte-network/src/test/java/com/powsybl/ucte/network/util/UcteNetworkUtilTest.java

ucte/ucte-network/src/main/java/com/powsybl/ucte/network/UcteCountryCode.java

ucte/ucte-converter/src/main/java/com/powsybl/ucte/converter/CounterNamingStrategy.java

Signed-off-by: Leclerc Clement <[email protected]>

sonarcloud · 2024-12-16T08:17:14Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
83.9% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

clementleclercRTE added 6 commits October 24, 2024 17:22

add xiidm to ucte element's id conversion

d9b20e7

Signed-off-by: Leclerc Clement <[email protected]>

add unique NodeId

4d9e59d

Signed-off-by: Leclerc Clement <[email protected]>

add unique NodeId

7a1e787

Signed-off-by: Leclerc Clement <[email protected]>

add unique NodeId

0d55a0b

Signed-off-by: Leclerc Clement <[email protected]>

change getVoltageLevelCode method

d5d9613

Signed-off-by: Leclerc Clement <[email protected]>

optimisation of checking elements

97b572a

Signed-off-by: Leclerc Clement <[email protected]>

clementleclercRTE requested a review from geofjamg November 12, 2024 08:22

clementleclercRTE linked an issue Nov 12, 2024 that may be closed by this pull request

Conversion to UCTE format #3191

Open

clementleclercRTE added 6 commits November 12, 2024 11:07

create CounterNamingStrategy

6a15014

Signed-off-by: Leclerc Clement <[email protected]>

create CounterNamingStrategy

1ce1b17

Signed-off-by: Leclerc Clement <[email protected]>

change nodeCounter incrementation loop

dadc852

Signed-off-by: Leclerc Clement <[email protected]>

change ElementId orderCode incrementation

f0bf333

Signed-off-by: Leclerc Clement <[email protected]>

change UtceExporter exception

74ad500

Signed-off-by: Leclerc Clement <[email protected]>

change

92ab8f9

Signed-off-by: Leclerc Clement <[email protected]>

olperr1 assigned clementleclercRTE Nov 14, 2024

olperr1 requested changes Nov 14, 2024

View reviewed changes

clementleclercRTE and others added 6 commits November 18, 2024 10:21

add LOGGER and update with change request

b8f8027

Signed-off-by: Leclerc Clement <[email protected]>

change dangling lines code generation

1dec470

Signed-off-by: Leclerc Clement <[email protected]>

change nodeID generation

cd42dcd

Signed-off-by: Leclerc Clement <[email protected]>

delete LOGGER

609bece

Signed-off-by: Leclerc Clement <[email protected]>

code optimisation

8f159d3

Signed-off-by: clementleclerc <[email protected]>

add CounterNamingStrategyTest

d7f076e

Signed-off-by: clementleclerc <[email protected]>

geofjamg requested changes Nov 25, 2024

View reviewed changes

clementleclercRTE added 7 commits November 25, 2024 15:36

code review

82783ef

Signed-off-by: Leclerc Clement <[email protected]>

changer danglingline getBusBreakerView()

4c9e246

Signed-off-by: Leclerc Clement <[email protected]>

inverse node order for Transformaters

bbfbee3

Signed-off-by: Leclerc Clement <[email protected]>

change incrementation of namingcounter

61995d8

Signed-off-by: Leclerc Clement <[email protected]>

retry change incrementation of namingcounter

45ed401

Signed-off-by: Leclerc Clement <[email protected]>

change implementation

84cf3c4

Signed-off-by: Leclerc Clement <[email protected]>

change OrderCode list

e618277

Signed-off-by: Leclerc Clement <[email protected]>

clementleclercRTE and others added 6 commits December 2, 2024 09:57

change OrderCode list

20e844c

Signed-off-by: Leclerc Clement <[email protected]>

change DanlingLine conversion

9762869

Signed-off-by: Leclerc Clement <[email protected]>

add orderCode getter

e2d11b7

Signed-off-by: Leclerc Clement <[email protected]>

delete system.out

5c20757

Signed-off-by: Leclerc Clement <[email protected]>

delete system.out

696ca51

Signed-off-by: Leclerc Clement <[email protected]>

Merge branch 'main' into 3191-conversion-to-ucte-format

f2ea4e3

geofjamg changed the title ~~[WIP] 3191 conversion to ucte format~~ [WIP] More robust UCTE naming strategy Dec 3, 2024

clementleclercRTE added 5 commits December 3, 2024 10:54

update CounterNamingStategyTest

b29e7b1

Signed-off-by: Leclerc Clement <[email protected]>

Merge remote-tracking branch 'origin/3191-conversion-to-ucte-format' …

bfe1509

…into 3191-conversion-to-ucte-format

update danglingline xnodeCode generation

5b63d1e

Signed-off-by: Leclerc Clement <[email protected]>

update test

7c480e7

Signed-off-by: Leclerc Clement <[email protected]>

create fromVoltageLevel in UcteCountryCode

ed79865

Signed-off-by: Leclerc Clement <[email protected]>

geofjamg approved these changes Dec 3, 2024

View reviewed changes

olperr1 added the Breaking Change API is broken label Dec 4, 2024

olperr1 requested changes Dec 4, 2024

View reviewed changes

olperr1 reviewed Dec 4, 2024

View reviewed changes

ucte/ucte-network/src/main/java/com/powsybl/ucte/network/UcteCountryCode.java Outdated Show resolved Hide resolved

alicecaron added the Release 03/2025 label Dec 5, 2024

clementleclercRTE added 3 commits December 9, 2024 10:17

update test

71046bb

Signed-off-by: Leclerc Clement <[email protected]>

add Exception for null equipement

444b327

Signed-off-by: Leclerc Clement <[email protected]>

add Exception for null equipment

1b686ae

Signed-off-by: Leclerc Clement <[email protected]>

olperr1 requested changes Dec 9, 2024

View reviewed changes

fix checkstyle error

930add0

Signed-off-by: Leclerc Clement <[email protected]>

clementleclercRTE changed the title ~~[WIP] More robust UCTE naming strategy~~ More robust UCTE naming strategy Dec 16, 2024

olperr1 approved these changes Dec 16, 2024

View reviewed changes

Merge branch 'main' into 3191-conversion-to-ucte-format

7e109f4

olperr1 merged commit 9001b57 into main Dec 16, 2024
8 checks passed

olperr1 deleted the 3191-conversion-to-ucte-format branch December 16, 2024 08:36

So-Fras mentioned this pull request Dec 16, 2024

Conversion to UCTE format #3191

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

More robust UCTE naming strategy #3206

More robust UCTE naming strategy #3206

clementleclercRTE commented Nov 12, 2024 •

edited by olperr1

Loading

olperr1 Dec 4, 2024

olperr1 Dec 4, 2024

geofjamg Dec 9, 2024

sonarcloud bot commented Dec 16, 2024

More robust UCTE naming strategy #3206

More robust UCTE naming strategy #3206

Conversation

clementleclercRTE commented Nov 12, 2024 • edited by olperr1 Loading

olperr1 Dec 4, 2024

Choose a reason for hiding this comment

olperr1 Dec 4, 2024

Choose a reason for hiding this comment

geofjamg Dec 9, 2024

Choose a reason for hiding this comment

sonarcloud bot commented Dec 16, 2024

Quality Gate passed

clementleclercRTE commented Nov 12, 2024 •

edited by olperr1

Loading