refactor!: rename MO to merit_order

statnett · Dec 6, 2024 · 5fbdac7 · 5fbdac7
1 parent 86e66c6
commit 5fbdac7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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;