Use PowerTransformerEnd.endNumber to sort transformer windings #3234
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rcourtier
added
Breaking Change
rcourtier
force-pushed
the
use_endnumber_for_powertransformerend_numbering
branch
2 times, most recently
from
2db89d4 to
2f92b88
Compare
rcourtier
force-pushed
the
use_endnumber_for_powertransformerend_numbering
branch
from
4e1fd3d to
f680d6a
Compare
…to sort transformer windings Signed-off-by: Romain Courtier <[email protected]>
Signed-off-by: Romain Courtier <[email protected]>
rcourtier
force-pushed
the
use_endnumber_for_powertransformerend_numbering
branch
from
f680d6a to
f6b0c3e
Compare
zamarrenolm
approved these changes
Jan 10, 2025
flo-dup
requested changes
Jan 10, 2025
Comment on lines
205
to
211
| .forEach(tends -> { | ||
| PropertyBags tends1 = new PropertyBags( | ||
| tends.getValue().stream() | ||
| .sorted(Comparator | ||
| .comparing(WindingType::fromTransformerEnd) | ||
| .thenComparing(end -> end.asInt(endNumber, -1))) | ||
| .collect(Collectors.toList())); | ||
| .sorted(Comparator.comparing(WindingType::endNumber)) | ||
| .toList()); | ||
| tends.setValue(tends1); | ||
| }); |
There was a problem hiding this comment.
This can be simplified into
gends.values().forEach(tends -> tends.sort(Comparator.comparing(WindingType::endNumber)));There was a problem hiding this comment.
Done.
However, please note that this will be reworked in #3238 and the sorting will be removed from here. Instead, it will be done within the SPARQL query.
Signed-off-by: Romain Courtier <[email protected]>
flo-dup
approved these changes
Jan 10, 2025
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Please check if the PR fulfills these requirements
Does this PR already have an issue describing the problem?
No.
What kind of change does this PR introduce?
Refactoring.
What is the current behavior?
During CGMES conversion of a CIM16 file (CGMES 2.4.15),
WindingTypeclass is using Terminal.sequenceNumber to classify and sort the windings as PRIMARY/SECONDARY/TERTIARY. However, sequenceNumber isn't fetched by the SPARQL query and therefore is never used in theWindingTypeclass. As a consequence, WindingType.windingType always returns PRIMARY for CIM16 Propertybags.This is not an issue because another sort is done in the CGMES import using PowerTransformerEnd.endNumber, giving the correct classifications of windings for CIM16 files, but this additional sorting shouldn't be required and should be done directly in
WindingType.What is the new behavior (if this is a feature change)?
Since the SPARQL queries fetch the PowerTransformerEnd.endNumber and use it to classify and sort the windings as PRIMARY/SECONDARY/TERTIARY, the use of Terminal.sequenceNumber is droped in favor of PowerTransformerEnd.endNumber.
As a consequence, the additional sorting in CGMES import isn't required anymore.
This also gives the iidm
WindingTypeclass a clearer purpose which is to support the difference in the modeling of the winding numberings between CIM14 and CIM16.Does this PR introduce a breaking change or deprecate an API?
Other information:
This is bad practice to rely on PowerTransformerEnd.Terminal.sequenceNumber. The correct way to classify windings in CIM16 is with the use of PowerTransformerEnd.endNumber.