Refactor PSS/E duplicated ID handling #3643
Open
Conversation
This file contains hidden or 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
…per ID Signed-off-by: Petr Janecek <[email protected]>
| } | ||
|
|
||
| private static void testInvalid(String resourcePath, String sample, String message) { | ||
| PsseException exception = Assertions.assertThrows(PsseException.class, () -> load(resourcePath, sample)); |
Contributor
There was a problem hiding this comment.
I think this method is unused, you can remove it.
| unique.add(psseObject); | ||
| } | ||
| foundIds.add(id); | ||
| }); |
Contributor
There was a problem hiding this comment.
Your method is perfectly valid, but since the map values are never null, we can simplify it a bit to be faster. Here is my proposal:
private <T> List<T> fixDuplicatedIds(List<T> psseObjects, Function<T, String> idBuilder, String elementTypeName) {
List<T> unique = new ArrayList<>();
Map<String, Integer> indexes = new HashMap<>();
psseObjects.forEach(psseObject -> {
var id = idBuilder.apply(psseObject);
Integer index = indexes.get(id);
if (index != null) {
LOGGER.warn("Duplicated {} Id: {}", elementTypeName, id);
unique.set(index, psseObject);
} else {
indexes.put(id, unique.size());
unique.add(psseObject);
}
});
return unique;
}
| @FunctionalInterface | ||
| public interface IdFixer<T> { | ||
| String fix(T t, Set<String> usedIds); | ||
| } |
Contributor
There was a problem hiding this comment.
I thinl this method is not used, we can remove it
Contributor
|
I checked the performance by importing a large case, and I didn’t see any impact. |
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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?
#3607
What kind of change does this PR introduce?
Refactor PSS/E duplicated ID handling.
What is the current behavior?
In the previous implementation, when a data record with the same ID was found, its ID was modified and a new element was created. This does not match PSS/E behavior, which in such cases updates the data of the existing element.
What is the new behavior (if this is a feature change)?
The new implementation uses a "last record wins" strategy - when a duplicate ID is encountered in the data, the last occurrence replaces all previous ones.
Does this PR introduce a breaking change or deprecate an API?
If yes, please check if the following requirements are fulfilled
What changes might users need to make in their application due to this PR? (migration steps)
Other information: