-
Notifications
You must be signed in to change notification settings - Fork 43
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.
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
CGMES import: make substations property bags distinct when their region is defined twice (in BD and IGM) #2507
Merged
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
…on is defined twice (in BD and IGM) Signed-off-by: VEDELAGO MIORA <miora.ralambotiana@rte-france.com>
I prefer to keep the complexity of dealing with multiple references to regions and subregions in the SPARQL query. Here is an updated version of the query for substations that works with the unit test: # query: substations
SELECT *
WHERE {
?Substation
a cim:Substation ;
cim:IdentifiedObject.name ?name .
# Optional is required to keep the ?Substation variable already bounded in the sub-queries ...
OPTIONAL {
{
SELECT ?SubRegion
WHERE {
?Substation cim:Substation.Region ?SubRegion .
?SubRegion a cim:SubGeographicalRegion .
}
LIMIT 1
}
?SubRegion cim:IdentifiedObject.name ?subRegionName .
OPTIONAL {
{
SELECT ?Region
WHERE {
?SubRegion cim:SubGeographicalRegion.Region ?Region .
?Region a cim:GeographicalRegion .
}
LIMIT 1
}
?Region cim:IdentifiedObject.name ?regionName .
}
}
# ... But we do not want results where the regions are missing
FILTER (bound(?SubRegion) && bound(?Region))
} |
…eir region is defined twice (in BD and IGM)" Signed-off-by: VEDELAGO MIORA <miora.ralambotiana@rte-france.com> This reverts commit 456d610.
Signed-off-by: VEDELAGO MIORA <miora.ralambotiana@rte-france.com>
miovd
force-pushed
the
fix_distinct_cgmes_substations
branch
from
March 21, 2023 12:54
6784710
to
fd408e0
Compare
zamarrenolm
approved these changes
Mar 21, 2023
Kudos, SonarCloud Quality Gate passed! |
miovd
added a commit
that referenced
this pull request
Mar 30, 2023
…on is defined twice (in BD and IGM) (#2507) Signed-off-by: VEDELAGO MIORA <miora.ralambotiana@rte-france.com> Co-authored-by: Luma <zamarrenolm@aia.es>
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 (please use
'[x]'
to check the checkboxes, or submit the PR and then click the checkboxes)Does this PR already have an issue describing the problem ? If so, link to this issue using
'#XXX'
and skip the restNo
What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)
Bug fix
What is the current behavior? (You can also link to an open issue here)
When the region of a substation is defined twice differently (different IDs in BD and IGM), two substations with the same ID are detected by the importer0
What is the new behavior (if this is a feature change)?
We keep only one substation with the same ID.
Does this PR introduce a breaking change or deprecate an API? If yes, check the following:
No
Other information:
(if any of the questions/checkboxes don't apply, please delete them entirely)