From 5fbdac72a0f9a6e19d79dd1e603b5809404928a7 Mon Sep 17 00:00:00 2001 From: Leif Warland Date: Fri, 6 Dec 2024 13:46:49 +0100 Subject: [PATCH] refactor!: rename MO to merit_order --- src/cimsparql/data_models.py | 2 +- src/cimsparql/sparql/synchronous_machines.sparql | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cimsparql/data_models.py b/src/cimsparql/data_models.py index e0405c05..44a3815b 100644 --- a/src/cimsparql/data_models.py +++ b/src/cimsparql/data_models.py @@ -104,7 +104,7 @@ class SynchronousMachinesSchema(NamedMarketResourceSchema): substation_mrid: Series[str] = pa.Field() max_p: Series[float] = pa.Field() min_p: Series[float] = pa.Field() - MO: Series[float] = pa.Field(nullable=True) + merit_order: Series[float] = pa.Field(nullable=True) sn: Series[float] = pa.Field() p: Series[float] = pa.Field(nullable=True) q: Series[float] = pa.Field(nullable=True) diff --git a/src/cimsparql/sparql/synchronous_machines.sparql b/src/cimsparql/sparql/synchronous_machines.sparql index 53054f17..3380f3ff 100644 --- a/src/cimsparql/sparql/synchronous_machines.sparql +++ b/src/cimsparql/sparql/synchronous_machines.sparql @@ -2,7 +2,7 @@ PREFIX cim: <${cim}> PREFIX SN: <${SN}> PREFIX xsd: <${xsd}> -select ?mrid ?name ?market_code ?node ?status ?station_group ?station_group_name ?substation_mrid ?max_p ?min_p ?MO ?sn ?p ?q ?connectivity_node ?generator_type ?schedule_resource +select ?mrid ?name ?market_code ?node ?status ?station_group ?station_group_name ?substation_mrid ?max_p ?min_p ?merit_order ?sn ?p ?q ?connectivity_node ?generator_type ?schedule_resource where { # Extract properties for synchronous machines. { @@ -39,7 +39,7 @@ where { optional { ?gen_unit SN:GeneratingUnit.marketCode ?market_code; - SN:GeneratingUnit.groupAllocationWeight ?MO; + SN:GeneratingUnit.groupAllocationWeight ?merit_order; SN:GeneratingUnit.ScheduleResource ?ScheduleResource . ?ScheduleResource SN:ScheduleResource.marketCode ?station_group; cim:IdentifiedObject.mRID ?schedule_resource;