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.

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
merged 6 commits into from
Mar 21, 2023

Conversation

miovd
Copy link
Contributor

@miovd miovd commented Mar 20, 2023

Please check if the PR fulfills these requirements (please use '[x]' to check the checkboxes, or submit the PR and then click the checkboxes)

  • 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 ? If so, link to this issue using '#XXX' and skip the rest
No

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)

…on is defined twice (in BD and IGM)

Signed-off-by: VEDELAGO MIORA <miora.ralambotiana@rte-france.com>
Signed-off-by: VEDELAGO MIORA <miora.ralambotiana@rte-france.com>
@miovd miovd requested a review from zamarrenolm March 20, 2023 13:05
@zamarrenolm
Copy link
Member

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

miovd added 2 commits March 21, 2023 13:54
…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 miovd force-pushed the fix_distinct_cgmes_substations branch from 6784710 to fd408e0 Compare March 21, 2023 12:54
@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

100.0% 100.0% Coverage
0.0% 0.0% Duplication

@miovd miovd merged commit 7f7608b into main Mar 21, 2023
@miovd miovd deleted the fix_distinct_cgmes_substations branch March 21, 2023 15:24
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants