From 381fcbaa25b9d7b5ff5924a45b4f9042749328bd Mon Sep 17 00:00:00 2001 From: Leif Warland Date: Fri, 28 Jun 2024 08:42:11 +0200 Subject: [PATCH] refactor!: remove un and substation_mrid from converter query Both available in bus --- src/cimsparql/data_models.py | 2 -- src/cimsparql/sparql/converters.sparql | 7 ++----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/cimsparql/data_models.py b/src/cimsparql/data_models.py index f4a1112a..2fe72fce 100644 --- a/src/cimsparql/data_models.py +++ b/src/cimsparql/data_models.py @@ -162,7 +162,6 @@ class PhaseTapChangerSchema(CoercingSchema): class ConvertersSchema(NamedResourceSchema): alias: Series[str] = pa.Field(nullable=True) - substation_mrid: Series[str] = pa.Field() status: Series[bool] = pa.Field() node: Series[str] = pa.Field() p: Series[float] = pa.Field() @@ -175,7 +174,6 @@ class ConvertersSchema(NamedResourceSchema): loss1: Series[float] = pa.Field() loss2: Series[float] = pa.Field() vdcn: Series[float] = pa.Field() - un: Series[float] = pa.Field() ConvertersDataFrame = DataFrame[ConvertersSchema] diff --git a/src/cimsparql/sparql/converters.sparql b/src/cimsparql/sparql/converters.sparql index d8e67637..74f12d5c 100644 --- a/src/cimsparql/sparql/converters.sparql +++ b/src/cimsparql/sparql/converters.sparql @@ -3,7 +3,7 @@ PREFIX cim:<${cim}> PREFIX xsd:<${xsd}> PREFIX SN:<${SN}> PREFIX ALG:<${ALG}> -select ?mrid ?name ?alias ?p ?q ?substation_mrid ?status ?node ?connectivity_node ?controller ?controller_factor ?pole_loss ?loss0 ?loss1 ?loss2 ?vdcn ?un +select ?mrid ?name ?alias ?p ?q ?status ?node ?connectivity_node ?controller ?controller_factor ?pole_loss ?loss0 ?loss1 ?loss2 ?vdcn where { { select * where { @@ -30,10 +30,7 @@ where { cim:Terminal.sequenceNumber|cim:ACDCTerminal.sequenceNumber 1 . ?con_node cim:IdentifiedObject.mRID ?connectivity_node; cim:ConnectivityNode.ConnectivityNodeContainer ?con_node_container. - ?con_node_container cim:VoltageLevel.Substation ?substation; - cim:VoltageLevel.BaseVoltage/cim:BaseVoltage.nominalVoltage ?un. - ?substation cim:IdentifiedObject.mRID ?substation_mrid; - cim:Substation.Region/cim:SubGeographicalRegion.Region/cim:IdentifiedObject.name ?area . + ?con_node_container cim:VoltageLevel.Substation/cim:Substation.Region/cim:SubGeographicalRegion.Region/cim:IdentifiedObject.name ?area . optional {?converter SN:Equipment.networkAnalysisEnable ?_analysis_enabled .} optional { ?converter ALG:VoltageSourceConverter.loss0 ?_loss0;