Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

More robust UCTE naming strategy #3206

Merged
merged 41 commits into from
Dec 16, 2024
Merged

More robust UCTE naming strategy #3206

merged 41 commits into from
Dec 16, 2024

Conversation

clementleclercRTE
Copy link
Contributor

@clementleclercRTE clementleclercRTE commented Nov 12, 2024 •
edited by olperr1
Loading

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

@clementleclercRTE @alicecaron
add xiidm to ucte element's id conversion
d9b20e7 
Signed-off-by: Leclerc Clement <[email protected]>
@clementleclercRTE @alicecaron
add unique NodeId
4d9e59d 
Signed-off-by: Leclerc Clement <[email protected]>
@clementleclercRTE @alicecaron
add unique NodeId
7a1e787 
Signed-off-by: Leclerc Clement <[email protected]>
@clementleclercRTE @alicecaron
add unique NodeId
0d55a0b 
Signed-off-by: Leclerc Clement <[email protected]>
@clementleclercRTE
change getVoltageLevelCode method
d5d9613 
Signed-off-by: Leclerc Clement <[email protected]>
@clementleclercRTE
optimisation of checking elements
97b572a 
Signed-off-by: Leclerc Clement <[email protected]>
@clementleclercRTE clementleclercRTE linked an issue Nov 12, 2024 that may be closed by this pull request
Conversion to UCTE format #3191
Open
@clementleclercRTE
create CounterNamingStrategy
6a15014 
Signed-off-by: Leclerc Clement <[email protected]>
@clementleclercRTE
create CounterNamingStrategy
1ce1b17 
Signed-off-by: Leclerc Clement <[email protected]>
@clementleclercRTE
change nodeCounter incrementation loop
dadc852 
Signed-off-by: Leclerc Clement <[email protected]>
@clementleclercRTE
change ElementId orderCode incrementation
f0bf333 
Signed-off-by: Leclerc Clement <[email protected]>
@clementleclercRTE
change UtceExporter exception
74ad500 
Signed-off-by: Leclerc Clement <[email protected]>
@clementleclercRTE
change
92ab8f9 
Signed-off-by: Leclerc Clement <[email protected]>
olperr1
olperr1 requested changes Nov 14, 2024
View reviewed changes
ucte/ucte-converter/src/main/java/com/powsybl/ucte/converter/CounterNamingStrategy.java Outdated Show resolved Hide resolved
ucte/ucte-converter/src/main/java/com/powsybl/ucte/converter/CounterNamingStrategy.java Outdated Show resolved Hide resolved
ucte/ucte-converter/src/main/java/com/powsybl/ucte/converter/CounterNamingStrategy.java Outdated Show resolved Hide resolved
ucte/ucte-converter/src/main/java/com/powsybl/ucte/converter/CounterNamingStrategy.java Outdated Show resolved Hide resolved
ucte/ucte-converter/src/main/java/com/powsybl/ucte/converter/CounterNamingStrategy.java Outdated Show resolved Hide resolved
ucte/ucte-converter/src/main/java/com/powsybl/ucte/converter/CounterNamingStrategy.java Outdated Show resolved Hide resolved
ucte/ucte-converter/src/main/java/com/powsybl/ucte/converter/CounterNamingStrategy.java Outdated Show resolved Hide resolved
ucte/ucte-converter/src/main/java/com/powsybl/ucte/converter/CounterNamingStrategy.java Outdated Show resolved Hide resolved
ucte/ucte-converter/src/main/java/com/powsybl/ucte/converter/CounterNamingStrategy.java Outdated Show resolved Hide resolved
ucte/ucte-converter/src/main/java/com/powsybl/ucte/converter/CounterNamingStrategy.java Outdated Show resolved Hide resolved
clementleclercRTE and others added 6 commits November 18, 2024 10:21
@clementleclercRTE
add LOGGER and update with change request
b8f8027 
Signed-off-by: Leclerc Clement <[email protected]>
@clementleclercRTE
change dangling lines code generation
1dec470 
Signed-off-by: Leclerc Clement <[email protected]>
@clementleclercRTE
change nodeID generation
cd42dcd 
Signed-off-by: Leclerc Clement <[email protected]>
@clementleclercRTE
delete LOGGER
609bece 
Signed-off-by: Leclerc Clement <[email protected]>
@leclerc92
code optimisation
8f159d3 
Signed-off-by: clementleclerc <[email protected]>
@leclerc92
add CounterNamingStrategyTest
d7f076e 
Signed-off-by: clementleclerc <[email protected]>
geofjamg
geofjamg requested changes Nov 25, 2024
View reviewed changes
ucte/ucte-converter/src/main/java/com/powsybl/ucte/converter/CounterNamingStrategy.java Show resolved Hide resolved
ucte/ucte-converter/src/main/java/com/powsybl/ucte/converter/CounterNamingStrategy.java Outdated Show resolved Hide resolved
ucte/ucte-converter/src/main/java/com/powsybl/ucte/converter/CounterNamingStrategy.java Outdated Show resolved Hide resolved
ucte/ucte-converter/src/main/java/com/powsybl/ucte/converter/CounterNamingStrategy.java Outdated Show resolved Hide resolved
ucte/ucte-converter/src/main/java/com/powsybl/ucte/converter/CounterNamingStrategy.java Outdated Show resolved Hide resolved
ucte/ucte-converter/src/main/java/com/powsybl/ucte/converter/CounterNamingStrategy.java Outdated Show resolved Hide resolved
ucte/ucte-converter/src/main/java/com/powsybl/ucte/converter/DefaultNamingStrategy.java Outdated Show resolved Hide resolved
ucte/ucte-converter/src/test/java/com/powsybl/ucte/converter/CounterNamingStrategyTest.java Show resolved Hide resolved
ucte/ucte-converter/src/test/java/com/powsybl/ucte/converter/CounterNamingStrategyTest.java Show resolved Hide resolved
ucte/ucte-converter/src/main/java/com/powsybl/ucte/converter/UcteExporter.java Outdated Show resolved Hide resolved
@clementleclercRTE
code review
82783ef 
Signed-off-by: Leclerc Clement <[email protected]>
@clementleclercRTE
changer danglingline getBusBreakerView()
4c9e246 
Signed-off-by: Leclerc Clement <[email protected]>
@clementleclercRTE
inverse node order for Transformaters
bbfbee3 
Signed-off-by: Leclerc Clement <[email protected]>
@clementleclercRTE
change incrementation of namingcounter
61995d8 
Signed-off-by: Leclerc Clement <[email protected]>
@clementleclercRTE
retry change incrementation of namingcounter
45ed401 
Signed-off-by: Leclerc Clement <[email protected]>
@clementleclercRTE
change implementation
84cf3c4 
Signed-off-by: Leclerc Clement <[email protected]>
@clementleclercRTE
change OrderCode list
e618277 
Signed-off-by: Leclerc Clement <[email protected]>
clementleclercRTE and others added 6 commits December 2, 2024 09:57
@geofjamg geofjamg changed the title [WIP] 3191 conversion to ucte format [WIP] More robust UCTE naming strategy Dec 3, 2024
@olperr1 olperr1 added the Breaking Change API is broken label Dec 4, 2024
olperr1
olperr1 reviewed Dec 4, 2024
View reviewed changes
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);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(But it is not required.)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@clementleclercRTE
update test
71046bb 
Signed-off-by: Leclerc Clement <[email protected]>
@clementleclercRTE
add Exception for null equipement
444b327 
Signed-off-by: Leclerc Clement <[email protected]>
@clementleclercRTE
add Exception for null equipment
1b686ae 
Signed-off-by: Leclerc Clement <[email protected]>
olperr1
olperr1 requested changes Dec 9, 2024
View reviewed changes
ucte/ucte-converter/src/main/java/com/powsybl/ucte/converter/AbstractNamingStrategy.java Outdated Show resolved Hide resolved
ucte/ucte-converter/src/main/java/com/powsybl/ucte/converter/AbstractNamingStrategy.java Outdated Show resolved Hide resolved
ucte/ucte-converter/src/main/java/com/powsybl/ucte/converter/AbstractNamingStrategy.java Outdated Show resolved Hide resolved
ucte/ucte-converter/src/main/java/com/powsybl/ucte/converter/AbstractNamingStrategy.java Outdated Show resolved Hide resolved
ucte/ucte-network/src/test/java/com/powsybl/ucte/network/util/UcteNetworkUtilTest.java Outdated Show resolved Hide resolved
ucte/ucte-network/src/main/java/com/powsybl/ucte/network/UcteCountryCode.java Outdated Show resolved Hide resolved
ucte/ucte-converter/src/main/java/com/powsybl/ucte/converter/CounterNamingStrategy.java Show resolved Hide resolved
@clementleclercRTE
fix checkstyle error
930add0 
Signed-off-by: Leclerc Clement <[email protected]>
@clementleclercRTE clementleclercRTE changed the title [WIP] More robust UCTE naming strategy More robust UCTE naming strategy Dec 16, 2024
@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Dec 16, 2024

Quality Gate Passed 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

@olperr1 olperr1 merged commit 9001b57 into main Dec 16, 2024
8 checks passed
@olperr1 olperr1 deleted the 3191-conversion-to-ucte-format branch December 16, 2024 08:36
@So-Fras So-Fras mentioned this pull request Dec 16, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@geofjamg geofjamg geofjamg approved these changes

@olperr1 olperr1 olperr1 approved these changes

Assignees

@clementleclercRTE clementleclercRTE

Labels
Breaking Change API is broken Release 03/2025
Projects
Release 03/2025
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Conversion to UCTE format
5 participants
@clementleclercRTE @geofjamg @olperr1 @alicecaron @leclerc92