CGMES export. Preserve original class of generators. Fix synchronous machine type. Fix operating mode #2726

marqueslanauja · 2023-09-29T07:11:03Z

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 one of the issues described in #2707

What kind of change does this PR introduce?

Feature

What is the current behavior?

The cgmes classes EquivalentInjection, ExternalNetworkInjection and SynchronousMachine, during the import process, are converted into generators. During the cgmes export process, all the IIDM generators are exported as SynchronousMachines, therefore the original cgmes classes are not preserved.

Also, during the cgmes export process, the SynchronousMachineKind and SynchronousMachineOperatingMode are always calculated based on the minP, maxP, and targetP attributes.

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

The cgmes original class is preserved during the cgmes export process, therefore generators are exported as EquivalentInjection, ExternalNetworkInjection and SynchronousMachine in concordance with their original class.

Original SynchronousMachineKind and SynchronousMachineOperatingMode are also preserved if they are compatible with the current attributes of the generator, in another case, the calculated values are exported.

To avoid Infinite values during reimport, minP, maxP, minQ, and maxQ attributes are not exported when they are assigned to the default values (Double.MIN_VALUE and Double.MAX_VALUE).

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

The Breaking Change or Deprecated label has been added
The migration guide has been updated in the github wiki (What changes might users need to make in their application due to this PR?)

Other information:

Signed-off-by: José Antonio Marqués <marquesja@aia.es>

…_operatingMode_issue_2707

Signed-off-by: José Antonio Marqués <marquesja@aia.es>

…_operatingMode_issue_2707

Signed-off-by: José Antonio Marqués <marquesja@aia.es>

cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/export/CgmesExportUtil.java

…_operatingMode_issue_2707

Signed-off-by: José Antonio Marqués <marquesja@aia.es>

marqueslanauja · 2023-10-19T12:33:43Z

I think it is better to keep duplicated code since it is more readable.

…_operatingMode_issue_2707 Signed-off-by: José Antonio Marqués <marquesja@aia.es> # Conflicts: # cgmes/cgmes-conversion/src/test/java/com/powsybl/cgmes/conversion/test/export/EquipmentExportTest.java

…_operatingMode_issue_2707 Signed-off-by: marqueslanauja <51124986+marqueslanauja@users.noreply.github.com>

…_operatingMode_issue_2707

…_operatingMode_issue_2707 Signed-off-by: José Antonio Marqués <marquesja@aia.es> # Conflicts: # cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/Conversion.java # cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/export/SteadyStateHypothesisExport.java # cgmes/cgmes-conversion/src/test/java/com/powsybl/cgmes/conversion/test/export/EquipmentExportTest.java # cgmes/cgmes-conversion/src/test/java/com/powsybl/cgmes/conversion/test/export/ExportXmlCompare.java # cgmes/cgmes-conversion/src/test/java/com/powsybl/cgmes/conversion/test/export/SteadyStateHypothesisExportTest.java

Signed-off-by: José Antonio Marqués <marquesja@aia.es>

…_operatingMode_issue_2707

…_operatingMode_issue_2707 Signed-off-by: José Antonio Marqués <marquesja@aia.es> # Conflicts: # cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/elements/EquivalentInjectionConversion.java # cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/export/elements/EquivalentInjectionEq.java

…_operatingMode_issue_2707

sonarcloud · 2024-01-15T13:57:53Z

Quality Gate passed

The SonarCloud Quality Gate passed, but some issues were introduced.

4 New issues
0 Security Hotspots
90.4% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

…_operatingMode_issue_2707 Signed-off-by: José Antonio Marqués <marquesja@aia.es> # Conflicts: # cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/Conversion.java # cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/export/EquipmentExport.java # cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/export/SteadyStateHypothesisExport.java # cgmes/cgmes-conversion/src/test/java/com/powsybl/cgmes/conversion/test/export/EquipmentExportTest.java

Signed-off-by: José Antonio Marqués <marquesja@aia.es>

…_operatingMode_issue_2707

nemanja-st

Mostly cosmetic changes, to align usage of string and const where possible.

.../src/main/java/com/powsybl/cgmes/conversion/elements/ExternalNetworkInjectionConversion.java

...ersion/src/main/java/com/powsybl/cgmes/conversion/elements/SynchronousMachineConversion.java

cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/export/CgmesExportUtil.java

cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/export/EquipmentExport.java

...onversion/src/main/java/com/powsybl/cgmes/conversion/export/SteadyStateHypothesisExport.java

Signed-off-by: José Antonio Marqués <marquesja@aia.es>

marqueslanauja · 2024-02-29T13:08:29Z

We added the generatorOrMotor kind.

…_operatingMode_issue_2707

...ersion/src/main/java/com/powsybl/cgmes/conversion/export/elements/EquivalentInjectionEq.java

…_operatingMode_issue_2707 Signed-off-by: José Antonio Marqués <marquesja@aia.es> # Conflicts: # cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/elements/SynchronousMachineConversion.java # cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/export/EquipmentExport.java

Signed-off-by: José Antonio Marqués <marquesja@aia.es>

…_operatingMode_issue_2707 Signed-off-by: José Antonio Marqués <marquesja@aia.es> # Conflicts: # cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/elements/SynchronousMachineConversion.java # cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/export/EquipmentExport.java # cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/export/SteadyStateHypothesisExport.java # cgmes/cgmes-conversion/src/test/java/com/powsybl/cgmes/conversion/test/export/EquipmentExportTest.java

…_operatingMode_issue_2707 Signed-off-by: José Antonio Marqués <marquesja@aia.es> # Conflicts: # cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/export/EquipmentExport.java # cgmes/cgmes-conversion/src/test/java/com/powsybl/cgmes/conversion/test/export/ExportXmlCompare.java

cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/export/CgmesExportUtil.java

…_operatingMode_issue_2707

Signed-off-by: José Antonio Marqués <marquesja@aia.es>

cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/export/CgmesExportUtil.java

zamarrenolm

The change has been verified using a big network to ensure we do not introduce any regression in performance

…_operatingMode_issue_2707

sonarcloud · 2024-03-27T09:55:30Z

Quality Gate passed

Issues
3 New issues
0 Accepted issues

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

See analysis details on SonarCloud

marqueslanauja and others added 10 commits September 29, 2023 09:09

Preserve original class of generators . Fix synchronousMachine type

dcc9cf9

Signed-off-by: José Antonio Marqués <marquesja@aia.es>

Merge branch 'main' into cgmes_export_fix_synchronousMachine_type_and…

0447faa

…_operatingMode_issue_2707

Pretty code. Fix code smells

d687d7b

Signed-off-by: José Antonio Marqués <marquesja@aia.es>

Fix code smells

e7964ff

Signed-off-by: José Antonio Marqués <marquesja@aia.es>

Fix operatingMode

f3409ef

Signed-off-by: José Antonio Marqués <marquesja@aia.es>

Add unitary tests

5914669

Signed-off-by: José Antonio Marqués <marquesja@aia.es>

Improve unitary test

55374b4

Signed-off-by: José Antonio Marqués <marquesja@aia.es>

Merge branch 'main' into cgmes_export_fix_synchronousMachine_type_and…

f2f0785

…_operatingMode_issue_2707

Merge branch 'main' into cgmes_export_fix_synchronousMachine_type_and…

84c46fe

…_operatingMode_issue_2707

minor changes

e9e6d8f

Signed-off-by: José Antonio Marqués <marquesja@aia.es>

nemanja-st reviewed Oct 13, 2023

View reviewed changes

cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/export/CgmesExportUtil.java Outdated Show resolved Hide resolved

marqueslanauja and others added 3 commits October 16, 2023 07:22

Merge branch 'main' into cgmes_export_fix_synchronousMachine_type_and…

d53bc50

…_operatingMode_issue_2707

Merge branch 'main' into cgmes_export_fix_synchronousMachine_type_and…

d6661d8

…_operatingMode_issue_2707

Add test

08c45ad

Signed-off-by: José Antonio Marqués <marquesja@aia.es>

Merge branch 'main' into cgmes_export_fix_synchronousMachine_type_and…

5dbfc89

…_operatingMode_issue_2707 Signed-off-by: José Antonio Marqués <marquesja@aia.es> # Conflicts: # cgmes/cgmes-conversion/src/test/java/com/powsybl/cgmes/conversion/test/export/EquipmentExportTest.java

marqueslanauja requested a review from zamarrenolm October 23, 2023 06:23

marqueslanauja and others added 9 commits October 26, 2023 16:44

Merge branch 'main' into cgmes_export_fix_synchronousMachine_type_and…

77ec192

…_operatingMode_issue_2707 Signed-off-by: marqueslanauja <51124986+marqueslanauja@users.noreply.github.com>

Merge branch 'main' into cgmes_export_fix_synchronousMachine_type_and…

da1b751

…_operatingMode_issue_2707

Fix code format

9c5b5ab

Signed-off-by: José Antonio Marqués <marquesja@aia.es>

Merge branch 'main' into cgmes_export_fix_synchronousMachine_type_and…

24a9728

…_operatingMode_issue_2707

Merge branch 'main' into cgmes_export_fix_synchronousMachine_type_and…

cd2ce52

…_operatingMode_issue_2707

Merge branch 'main' into cgmes_export_fix_synchronousMachine_type_and…

c07ee9e

…_operatingMode_issue_2707

Merge branch 'main' into cgmes_export_fix_synchronousMachine_type_and…

76582d5

…_operatingMode_issue_2707

zamarrenolm added the CGMES label Jan 9, 2024

zamarrenolm changed the title ~~Cgmes Export: Preserve original class of generators . Fix synchronousMachine type. Fix operatingMode~~ CGMES export. Preserve original class of generators. Fix Synchronous Machine type. Fix operating mode Jan 9, 2024

zamarrenolm changed the title ~~CGMES export. Preserve original class of generators. Fix Synchronous Machine type. Fix operating mode~~ CGMES export. Preserve original class of generators. Fix synchronous machine type. Fix operating mode Jan 9, 2024

Merge branch 'main' into cgmes_export_fix_synchronousMachine_type_and…

5cce668

…_operatingMode_issue_2707

annetill added the March release label Feb 19, 2024

annetill requested a review from colinepiloquet February 21, 2024 09:20

marqueslanauja and others added 3 commits February 22, 2024 12:37

Fix code smell

a22362b

Signed-off-by: José Antonio Marqués <marquesja@aia.es>

Merge branch 'main' into cgmes_export_fix_synchronousMachine_type_and…

00aba16

…_operatingMode_issue_2707

nemanja-st requested changes Feb 28, 2024

View reviewed changes

Apply reviewer's comments

390cfe7

Signed-off-by: José Antonio Marqués <marquesja@aia.es>

Merge branch 'main' into cgmes_export_fix_synchronousMachine_type_and…

73307fc

…_operatingMode_issue_2707

colinepiloquet reviewed Mar 5, 2024

View reviewed changes

...ersion/src/main/java/com/powsybl/cgmes/conversion/export/elements/EquivalentInjectionEq.java Show resolved Hide resolved

marqueslanauja added 2 commits March 5, 2024 14:24

Complete TODO isCondenser method

8c5426c

Signed-off-by: José Antonio Marqués <marquesja@aia.es>

colinepiloquet approved these changes Mar 5, 2024

View reviewed changes

marqueslanauja added 2 commits March 13, 2024 08:17

annetill reviewed Mar 15, 2024

View reviewed changes

cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/export/CgmesExportUtil.java Show resolved Hide resolved

Merge branch 'main' into cgmes_export_fix_synchronousMachine_type_and…

8531434

…_operatingMode_issue_2707

annetill removed the March release label Mar 18, 2024

marqueslanauja and others added 3 commits March 21, 2024 07:51

Merge branch 'main' into cgmes_export_fix_synchronousMachine_type_and…

fbff1b8

…_operatingMode_issue_2707

Merge branch 'main' into cgmes_export_fix_synchronousMachine_type_and…

2de183e

…_operatingMode_issue_2707

Apply reviewer's comments. Fix cim16.sparql bug

cc87039

Signed-off-by: José Antonio Marqués <marquesja@aia.es>

nemanja-st approved these changes Mar 22, 2024

View reviewed changes

cgmes/cgmes-conversion/src/main/java/com/powsybl/cgmes/conversion/export/CgmesExportUtil.java Show resolved Hide resolved

zamarrenolm reviewed Mar 22, 2024

View reviewed changes

annetill added March release PR: ready-to-be-merged labels Mar 27, 2024

Merge branch 'main' into cgmes_export_fix_synchronousMachine_type_and…

afaaf12

…_operatingMode_issue_2707

annetill merged commit 27e5368 into main Mar 27, 2024
6 checks passed

annetill deleted the cgmes_export_fix_synchronousMachine_type_and_operatingMode_issue_2707 branch March 27, 2024 10:01

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CGMES export. Preserve original class of generators. Fix synchronous machine type. Fix operating mode #2726

CGMES export. Preserve original class of generators. Fix synchronous machine type. Fix operating mode #2726

marqueslanauja commented Sep 29, 2023 •

edited

Loading

marqueslanauja commented Oct 19, 2023

sonarcloud bot commented Jan 15, 2024

nemanja-st left a comment

marqueslanauja commented Feb 29, 2024

zamarrenolm left a comment

sonarcloud bot commented Mar 27, 2024

CGMES export. Preserve original class of generators. Fix synchronous machine type. Fix operating mode #2726

CGMES export. Preserve original class of generators. Fix synchronous machine type. Fix operating mode #2726

Conversation

marqueslanauja commented Sep 29, 2023 • edited Loading

marqueslanauja commented Oct 19, 2023

sonarcloud bot commented Jan 15, 2024

Quality Gate passed

nemanja-st left a comment

Choose a reason for hiding this comment

marqueslanauja commented Feb 29, 2024

zamarrenolm left a comment

Choose a reason for hiding this comment

sonarcloud bot commented Mar 27, 2024

Quality Gate passed

marqueslanauja commented Sep 29, 2023 •

edited

Loading