diff --git a/diagrams/SAREF4GRID examples.xml b/diagrams/SAREF4GRID examples.xml index 8530ad918ed3ccc5be302f281a2a7b4d8c5b967f..76321952087830d93736a68db8d69b77cda7b689 100644 --- a/diagrams/SAREF4GRID examples.xml +++ b/diagrams/SAREF4GRID examples.xml @@ -1,10 +1,10 @@ - + - + - + @@ -158,7 +158,7 @@ - + @@ -181,11 +181,11 @@ - + - + @@ -264,11 +264,11 @@ - + - + @@ -321,11 +321,11 @@ - + - + @@ -465,11 +465,11 @@ - + - + @@ -548,11 +548,11 @@ - + - + @@ -677,11 +677,11 @@ - + - + @@ -1038,7 +1038,7 @@ - + @@ -1057,7 +1057,7 @@ - + @@ -1227,7 +1227,7 @@ - + @@ -1386,7 +1386,7 @@ - + @@ -1472,7 +1472,7 @@ - + @@ -1962,11 +1962,11 @@ - + - + @@ -2065,7 +2065,7 @@ - + @@ -2186,7 +2186,7 @@ - + @@ -2307,7 +2307,7 @@ - + @@ -2457,7 +2457,7 @@ - + @@ -2611,11 +2611,11 @@ - + - + @@ -2707,7 +2707,7 @@ - + @@ -2817,7 +2817,7 @@ - + @@ -2931,7 +2931,7 @@ - + @@ -3003,7 +3003,7 @@ - + @@ -3059,7 +3059,7 @@ - + @@ -3187,7 +3187,7 @@ - + diff --git a/diagrams/SAREF4GRID figures.xml b/diagrams/SAREF4GRID figures.xml index 82270ee3f84176dd6e5b98428f8655de324c875d..0b1154166cfc41d6a0fb694b6dd90f4d90e4f7bf 100644 --- a/diagrams/SAREF4GRID figures.xml +++ b/diagrams/SAREF4GRID figures.xml @@ -1,13 +1,13 @@ - + - + - + @@ -119,7 +119,7 @@ - + @@ -204,7 +204,7 @@ - + @@ -332,7 +332,7 @@ - + @@ -353,7 +353,7 @@ - + @@ -373,14 +373,14 @@ - + - + @@ -401,7 +401,7 @@ - + @@ -421,14 +421,14 @@ - + - + @@ -449,7 +449,7 @@ - + @@ -469,21 +469,21 @@ - + - + - + @@ -550,7 +550,7 @@ - + @@ -618,7 +618,7 @@ - + @@ -713,7 +713,7 @@ - + @@ -747,11 +747,11 @@ - + - + @@ -872,7 +872,7 @@ - + @@ -997,7 +997,7 @@ - + @@ -1024,7 +1024,7 @@ - + @@ -1150,7 +1150,7 @@ - + @@ -1257,7 +1257,7 @@ - + @@ -1316,7 +1316,7 @@ - + @@ -1426,7 +1426,7 @@ - + @@ -1491,7 +1491,7 @@ - + @@ -1512,7 +1512,7 @@ - + @@ -1574,7 +1574,7 @@ - + @@ -1623,7 +1623,7 @@ - + @@ -1672,7 +1672,7 @@ - + @@ -1833,7 +1833,7 @@ - + @@ -1876,7 +1876,7 @@ - + @@ -2043,7 +2043,7 @@ - + @@ -2181,23 +2181,23 @@ - + - + - + - + - + @@ -2240,7 +2240,7 @@ - + @@ -2336,58 +2336,58 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2397,12 +2397,12 @@ - + - + @@ -2412,12 +2412,12 @@ - + - + @@ -2427,14 +2427,14 @@ - + - + @@ -2477,7 +2477,7 @@ - + @@ -2582,67 +2582,67 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2652,12 +2652,12 @@ - + - + @@ -2667,25 +2667,25 @@ - + - + - + - + @@ -2763,7 +2763,7 @@ - + @@ -2827,7 +2827,7 @@ - + @@ -2849,7 +2849,7 @@ - + @@ -3004,7 +3004,7 @@ - + @@ -3045,7 +3045,7 @@ - + @@ -3145,61 +3145,61 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -3209,75 +3209,75 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/documentation/description.html b/documentation/description.html index ede13baf1c4b641f3f83774e1584b7658cfe2d0f..3b20e6ca96fc401da2df4c0a12eccef8cea4b3f1 100644 --- a/documentation/description.html +++ b/documentation/description.html @@ -34,7 +34,7 @@

Meter

-

Figure 5 provides an overview of how to represent an electric grid meter using the s4grid:Meter class. +

Figure 5 provides an overview of how to represent an electric grid meter using the s4grid:GridMeter class. The representation of electric grid meters and their properties has been extracted from the DLMS/COSEM standard (IEC 62056)

Unlike in other SAREF extensions, meter-specific information is not defined using properties from SAREF. This is because the DLMS/COSEM standard defines the data diff --git a/examples/Action.ttl b/examples/Action.ttl index a7e0cffd8d3cca4c4bf08574eacde2a545c1775e..ae34c694ad916722ad9956753d5f978b65c2c075 100644 --- a/examples/Action.ttl +++ b/examples/Action.ttl @@ -53,7 +53,7 @@ s4grid:hasDayId a owl:DatatypeProperty . # Classes ################################################################# -s4grid:Meter a owl:Class . +s4grid:GridMeter a owl:Class . s4grid:ActionService a owl:Class . @@ -72,7 +72,7 @@ s4grid:ComplexActionOperationInput a owl:Class . # Individuals ################################################################# -ex:Meter1234 a s4grid:Meter, +ex:Meter1234 a s4grid:GridMeter, owl:NamedIndividual ; oneM2M:hasService ex:ResetServiceRegister, ex:PresetAdjustingTimeServiceClock , diff --git a/examples/ActivityCalendar.ttl b/examples/ActivityCalendar.ttl index 2de9df09aae8bb1214e84fc87b38782a646738a3..f096ba7b2a4d9b382780e87b6ea36f59e67c8d92 100644 --- a/examples/ActivityCalendar.ttl +++ b/examples/ActivityCalendar.ttl @@ -75,7 +75,7 @@ s4grid:hasStartTime a owl:DatatypeProperty . # Classes ################################################################# -s4grid:Meter a owl:Class . +s4grid:GridMeter a owl:Class . s4grid:ActivityCalendar a owl:Class . @@ -104,7 +104,7 @@ ex:ActivityCalendarContract1-1234 a s4grid:ActivityCalendar, s4grid:hasObis "0-0:13.0.1.255"^^xsd:string ; s4grid:hasActiveSeasonProfile ex:SeasonActive1. -ex:Meter1234 a s4grid:Meter, +ex:Meter1234 a s4grid:GridMeter, owl:NamedIndividual ; s4grid:hasActivityCalendar ex:ActivityCalendarContract1-1234. diff --git a/examples/BreakerState.ttl b/examples/BreakerState.ttl index 6503778bb108867eead827ffdf028d487eb0c17e..d85c0dfee0913995fb30b75fb38b9ad56baf6bc2 100644 --- a/examples/BreakerState.ttl +++ b/examples/BreakerState.ttl @@ -44,14 +44,14 @@ s4grid:hasOutputState a owl:DatatypeProperty . s4grid:BreakerState a owl:Class . -s4grid:Meter a owl:Class . +s4grid:GridMeter a owl:Class . ################################################################# # Individuals ################################################################# -ex:Meter1234 a s4grid:Meter, +ex:Meter1234 a s4grid:GridMeter, owl:NamedIndividual ; saref:hasState ex:CurrentConnectivityState . diff --git a/examples/Clock.ttl b/examples/Clock.ttl index 3c7e32e49ea505e466fe2c5937004adb82929037..3685be5e0a5484ca261182ff3fc51acf2ba7628f 100644 --- a/examples/Clock.ttl +++ b/examples/Clock.ttl @@ -53,14 +53,14 @@ s4grid:hasTimeZone a owl:DatatypeProperty . s4grid:Clock a owl:Class . -s4grid:Meter a owl:Class . +s4grid:GridMeter a owl:Class . ################################################################# # Individuals ################################################################# -ex:Meter1234 a s4grid:Meter, +ex:Meter1234 a s4grid:GridMeter, owl:NamedIndividual ; s4grid:hasClock ex:Clock1234 . diff --git a/examples/Firmware.ttl b/examples/Firmware.ttl index 4eb76ae7917967811e13b60482b38e86373a8b54..d801a3df29ad655cdd951d7aec2308b42a2eb566 100644 --- a/examples/Firmware.ttl +++ b/examples/Firmware.ttl @@ -43,14 +43,14 @@ s4grid:hasVendorId a owl:DatatypeProperty . s4grid:Firmware a owl:Class . -s4grid:Meter a owl:Class . +s4grid:GridMeter a owl:Class . ################################################################# # Individuals ################################################################# -ex:Meter1234 a s4grid:Meter, +ex:Meter1234 a s4grid:GridMeter, owl:NamedIndividual ; s4grid:hasFirmware ex:ActivePLCFirmware . diff --git a/examples/Get.ttl b/examples/Get.ttl index d242865f107d335de5b26abb5c4efae63f2a95e9..cd41263ff5d7f5fbb1160be42a114233fb48cb0b 100644 --- a/examples/Get.ttl +++ b/examples/Get.ttl @@ -57,7 +57,7 @@ s4grid:obtainToEntry a owl:DatatypeProperty . # Classes ################################################################# -s4grid:Meter a owl:Class . +s4grid:GridMeter a owl:Class . s4grid:GetService a owl:Class . @@ -86,7 +86,7 @@ s4grid:SelectiveAccess a owl:Class . # Individuals ################################################################# -ex:Meter1234 a s4grid:Meter, +ex:Meter1234 a s4grid:GridMeter, owl:NamedIndividual ; oneM2M:hasService ex:GetServiceIncrementalLoadProfile, ex:GetServiceCapturePeriodIncrementalLoadProfile, diff --git a/examples/Measurements.ttl b/examples/Measurements.ttl index 3443db38a89ca12f1b82822bca829a71f6b8ccee..d530f36a9b7771f8981447fed4b678a50debcae5 100644 --- a/examples/Measurements.ttl +++ b/examples/Measurements.ttl @@ -55,7 +55,7 @@ saref:hasValue a owl:DatatypeProperty . # Classes ################################################################# -s4grid:Meter a owl:Class . +s4grid:GridMeter a owl:Class . s4grid:PowerLine a owl:Class . @@ -88,7 +88,7 @@ ex:MaximumDemandRegisterImportC1TP1Measurement136 a saref:Measurement, saref:isMeasuredIn om:watt ; saref:relatesToProperty ex:MaximumDemandRegisterImportC1TP1 . -ex:Meter1234 a s4grid:Meter, +ex:Meter1234 a s4grid:GridMeter, owl:NamedIndividual ; saref:makesMeasurement ex:TotalIncrementalActiveEnergyImportMeasurement123, ex:MaximumDemandRegisterImportC1TP1Measurement136 . diff --git a/examples/NetworkInterface.ttl b/examples/NetworkInterface.ttl index b5768da9352ec02c1b14dc04f7450b5e543c522b..c3ba38d3f06308491be8de271dc9dfc3649242a8 100644 --- a/examples/NetworkInterface.ttl +++ b/examples/NetworkInterface.ttl @@ -37,7 +37,7 @@ s4grid:hasObis a owl:DatatypeProperty . # Classes ################################################################# -s4grid:Meter a owl:Class . +s4grid:GridMeter a owl:Class . s4grid:NetworkInterface a owl:Class . @@ -46,7 +46,7 @@ s4grid:NetworkInterface a owl:Class . # Individuals ################################################################# -ex:Meter1234 a s4grid:Meter, +ex:Meter1234 a s4grid:GridMeter, owl:NamedIndividual ; s4grid:hasNetworkInterface ex:MacAddress1234 . diff --git a/examples/ProfileGeneric.ttl b/examples/ProfileGeneric.ttl index a56ae5beb79f5d101bc06771b12cfc726ae41c56..1b3531ab6b059f01b27b9f8e91ed0c821cd3ee5a 100644 --- a/examples/ProfileGeneric.ttl +++ b/examples/ProfileGeneric.ttl @@ -72,7 +72,7 @@ s4grid:hasTimeZone a owl:DatatypeProperty . s4grid:Clock a owl:Class . -s4grid:Meter a owl:Class . +s4grid:GridMeter a owl:Class . s4grid:PropertyValue a owl:Class . @@ -105,7 +105,7 @@ ex:IncrementalLoadProfile1234 a s4grid:ProfileGeneric, ex:Measurement6 ; s4grid:relatedPropertyValue ex:PropertyValue1 . -ex:Meter1234 a s4grid:Meter, +ex:Meter1234 a s4grid:GridMeter, owl:NamedIndividual ; s4grid:hasProfileGeneric ex:IncrementalLoadProfile1234 . diff --git a/examples/PropertyValues.ttl b/examples/PropertyValues.ttl index c674d674dadb389e6cdde5a1a3a61ffa6bc9c3d1..d81c1c53be5c44b6c8d0c02db93a47a1c878694e 100644 --- a/examples/PropertyValues.ttl +++ b/examples/PropertyValues.ttl @@ -47,7 +47,7 @@ s4grid:hasValue a owl:DatatypeProperty . saref:UnitOfMeasure a owl:Class . -s4grid:Meter a owl:Class . +s4grid:GridMeter a owl:Class . s4grid:PropertyValue a owl:Class . @@ -60,7 +60,7 @@ s4grid:MeterProperty a owl:Class ; # Individuals ################################################################# -ex:Meter1234 a s4grid:Meter, +ex:Meter1234 a s4grid:GridMeter, owl:NamedIndividual ; s4grid:hasPropertyValue ex:PropertyValue234, ex:PropertyValue678. diff --git a/examples/ScriptTable_SingleActionSchedule.ttl b/examples/ScriptTable_SingleActionSchedule.ttl index 4687050b1383c19d08b5e86f333fde30c31b0d0e..5f7595b019cd6eca4c7dfc2fa6a6e60a610997f8 100644 --- a/examples/ScriptTable_SingleActionSchedule.ttl +++ b/examples/ScriptTable_SingleActionSchedule.ttl @@ -43,7 +43,7 @@ s4grid:hasObis a owl:DatatypeProperty . # Classes ################################################################# -s4grid:Meter a owl:Class . +s4grid:GridMeter a owl:Class . s4grid:Script a owl:Class . @@ -56,7 +56,7 @@ s4grid:SingleScheduledAction a owl:Class . # Individuals ################################################################# -ex:Meter1234 a s4grid:Meter, +ex:Meter1234 a s4grid:GridMeter, owl:NamedIndividual ; s4grid:hasScriptTable ex:DisconnectScriptTable ; s4grid:hasSingleScheduledAction ex:DisconnectControlScheduler . diff --git a/examples/Set.ttl b/examples/Set.ttl index d446c207a50fda37a8b289e1412c5b8197338268..b4c40ab6f5025bbead2d5a6be95eeee6fb360a34 100644 --- a/examples/Set.ttl +++ b/examples/Set.ttl @@ -45,7 +45,7 @@ s4grid:hasInputDataType a owl:DatatypeProperty . # Classes ################################################################# -s4grid:Meter a owl:Class . +s4grid:GridMeter a owl:Class . s4grid:SetService a owl:Class . @@ -62,7 +62,7 @@ s4grid:SetOperationDataInput a owl:Class . # Individuals ################################################################# -ex:Meter1234 a s4grid:Meter, +ex:Meter1234 a s4grid:GridMeter, owl:NamedIndividual ; oneM2M:hasService ex:SetMulticastCommunicationIdentifier, ex:SetServiceCapturePeriodIncrementalLoadProfile, diff --git a/ontology/saref4grid.ttl b/ontology/saref4grid.ttl index 0fc44fa0d2a34a529cda7881eb69b3576dc76109..395543e94c5f959961379660db4976c525094adc 100644 --- a/ontology/saref4grid.ttl +++ b/ontology/saref4grid.ttl @@ -217,13 +217,13 @@ s4grid:hasActiveSeasonProfile a owl:ObjectProperty ; s4grid:hasActivityCalendar a owl:ObjectProperty ; rdfs:comment "The activity calendar of a meter"@en ; rdfs:label "has activity calendar"@en ; - rdfs:domain s4grid:Meter ; + rdfs:domain s4grid:GridMeter ; rdfs:range s4grid:ActivityCalendar . s4grid:hasClock a owl:ObjectProperty ; rdfs:comment "The clock of the meter"@en ; rdfs:label "has clock"@en ; - rdfs:domain s4grid:Meter ; + rdfs:domain s4grid:GridMeter ; rdfs:range s4grid:Clock . s4grid:hasDayProfile a owl:ObjectProperty ; @@ -241,7 +241,7 @@ s4grid:hasDaySchedule a owl:ObjectProperty ; s4grid:hasFirmware a owl:ObjectProperty ; rdfs:comment "The firmware of the meter"@en ; rdfs:label "has firmware"@en ; - rdfs:domain s4grid:Meter ; + rdfs:domain s4grid:GridMeter ; rdfs:range s4grid:Firmware . s4grid:hasFridayProfile a owl:ObjectProperty ; @@ -257,7 +257,7 @@ s4grid:hasMondayProfile a owl:ObjectProperty ; s4grid:hasNetworkInterface a owl:ObjectProperty ; rdfs:comment "The network interface of the meter"@en ; rdfs:label "has network interface"@en ; - rdfs:domain s4grid:Meter ; + rdfs:domain s4grid:GridMeter ; rdfs:range s4grid:NetworkInterface . s4grid:hasPassiveSeasonProfile a owl:ObjectProperty ; @@ -269,7 +269,7 @@ s4grid:hasPassiveSeasonProfile a owl:ObjectProperty ; s4grid:hasProfileGeneric a owl:ObjectProperty ; rdfs:comment "The profile generic of a meter"@en ; rdfs:label "has profile generic"@en ; - rdfs:domain s4grid:Meter ; + rdfs:domain s4grid:GridMeter ; rdfs:range s4grid:ProfileGeneric . s4grid:hasProperty a owl:ObjectProperty ; @@ -281,7 +281,7 @@ s4grid:hasProperty a owl:ObjectProperty ; s4grid:hasPropertyValue a owl:ObjectProperty ; rdfs:comment "The property value of a meter"@en ; rdfs:label "has property value"@en ; - rdfs:domain s4grid:Meter ; + rdfs:domain s4grid:GridMeter ; rdfs:range s4grid:PropertyValue . s4grid:hasSaturdayProfile a owl:ObjectProperty ; @@ -292,7 +292,7 @@ s4grid:hasSaturdayProfile a owl:ObjectProperty ; s4grid:hasScriptTable a owl:ObjectProperty ; rdfs:comment "The script table of a meter"@en ; rdfs:label "has script table"@en ; - rdfs:domain s4grid:Meter ; + rdfs:domain s4grid:GridMeter ; rdfs:range s4grid:ScriptTable . s4grid:hasSelectiveAccess a owl:ObjectProperty ; @@ -304,7 +304,7 @@ s4grid:hasSelectiveAccess a owl:ObjectProperty ; s4grid:hasSingleScheduledAction a owl:ObjectProperty ; rdfs:comment "The single scheduled action of a meter"@en ; rdfs:label "has single scheduled action"@en ; - rdfs:domain s4grid:Meter ; + rdfs:domain s4grid:GridMeter ; rdfs:range s4grid:SingleScheduledAction . s4grid:hasSpecialDayProfile a owl:ObjectProperty ; @@ -858,7 +858,7 @@ s4grid:MeterProperty a owl:Class ; rdfs:label "Meter Property"@en ; rdfs:subClassOf saref:Property . -s4grid:Meter a owl:Class ; +s4grid:GridMeter a owl:Class ; rdfs:comment "Metering device that remotely records real electricity consumption. This device allows to control all the information regarding consumption for any time range, automatically and remotely"@en ; rdfs:label "Meter"@en ; rdfs:subClassOf [ a owl:Restriction ; diff --git a/tests/tests.csv b/tests/tests.csv index a7960d4c5454cbcb7f289cf38f97ac966f0112a8..bf1f27ed306fe775f8e41594b29a8b3a7eb29505 100644 --- a/tests/tests.csv +++ b/tests/tests.csv @@ -1,54 +1,54 @@ Id;Requirement;Category;Test -GRID-TEST-1;GRID-1;Remote management of meters;Meter hasPropertyValue PropertyValue +GRID-TEST-1;GRID-1;Remote management of meters;GridMeter hasPropertyValue PropertyValue GRID-TEST-2;GRID-1;Remote management of meters;PropertyValue hasProperty MeterProperty GRID-TEST-3;GRID-1;Remote management of meters;Manufacturer type MeterProperty GRID-TEST-4;GRID-2;Remote management of meters;ScreenDisplay type MeterProperty GRID-TEST-5;GRID-3;Remote management of meters;TransformerRatio type MeterProperty GRID-TEST-6;GRID-4;Remote management of meters;TransformerRatio type MeterProperty -GRID-TEST-7;GRID-5;Remote management of meters;Meter hasFirmware Firmware +GRID-TEST-7;GRID-5;Remote management of meters;GridMeter hasFirmware Firmware GRID-TEST-8;GRID-6;Remote management of meters;Network type MeterProperty GRID-TEST-9;GRID-7;Remote management of meters;MeterProperty hasObis string -GRID-TEST-10;GRID-7;Remote management of meters;Meter hasService GetService +GRID-TEST-10;GRID-7;Remote management of meters;GridMeter hasService GetService GRID-TEST-11;GRID-7;Remote management of meters;GetService hasOperation GetOperation GRID-TEST-12;GRID-7;Remote management of meters;GetService hasInput GetOperationPropertyInput GRID-TEST-13;GRID-7;Remote management of meters;GetOperationPropertyInput obtainInputFromObis string GRID-TEST-14;GRID-7;Remote management of meters;GetOperationPropertyInput obtainInputForProperty string GRID-TEST-15;GRID-7;Remote management of meters;GetService hasOutput GetOperationObjectOutput GRID-TEST-16;GRID-7;Remote management of meters;GetOperationObjectOutput hasOutputObjectType string -GRID-TEST-17;GRID-8;Remote management of meters;Meter hasService SetService +GRID-TEST-17;GRID-8;Remote management of meters;GridMeter hasService SetService GRID-TEST-18;GRID-8;Remote management of meters;SetService hasOperation SetOperation GRID-TEST-19;GRID-8;Remote management of meters;SetOperation hasInput SetOperationObjectInput GRID-TEST-20;GRID-8;Remote management of meters;SetOperationObjectInput obtainInputFromObis string GRID-TEST-21;GRID-8;Remote management of meters;SetOperationObjectInput obtainInputForProperty string GRID-TEST-22;GRID-8;Remote management of meters;SetOperationObjectInput hasInputObjectType string -GRID-TEST-23;GRID-8;Remote management of meters;Meter hasService GetService -GRID-TEST-24;GRID-9;Remote management of meters;Meter hasService SetService -GRID-TEST-25;GRID-9;Remote management of meters;Meter hasService GetService -GRID-TEST-26;GRID-10;Remote management of meters;Meter hasService SetService -GRID-TEST-27;GRID-10;Remote management of meters;Meter hasService GetService -GRID-TEST-28;GRID-11;Remote management of meters;Meter hasService SetService -GRID-TEST-29;GRID-11;Remote management of meters;Meter hasService GetService +GRID-TEST-23;GRID-8;Remote management of meters;GridMeter hasService GetService +GRID-TEST-24;GRID-9;Remote management of meters;GridMeter hasService SetService +GRID-TEST-25;GRID-9;Remote management of meters;GridMeter hasService GetService +GRID-TEST-26;GRID-10;Remote management of meters;GridMeter hasService SetService +GRID-TEST-27;GRID-10;Remote management of meters;GridMeter hasService GetService +GRID-TEST-28;GRID-11;Remote management of meters;GridMeter hasService SetService +GRID-TEST-29;GRID-11;Remote management of meters;GridMeter hasService GetService GRID-TEST-30;GRID-12;Remote management of meters;SetOperation hasInput SetOperationDataInput GRID-TEST-31;GRID-12;Remote management of meters;SetOperationDataInput obtainInputFromObis string GRID-TEST-32;GRID-12;Remote management of meters;SetOperationDataInput obtainInputForProperty string GRID-TEST-33;GRID-12;Remote management of meters;SetOperationDataInput hasInputDataType string -GRID-TEST-34;GRID-13;Remote management of meters;Meter hasState BreakerState +GRID-TEST-34;GRID-13;Remote management of meters;GridMeter hasState BreakerState GRID-TEST-35;GRID-14;Remote management of meters;Threshold type MeterProperty GRID-TEST-36;GRID-15;Remote management of meters;MeterProperty isMeasuredIn UnitOfMeasure -GRID-TEST-37;GRID-16;Remote management of meters;Meter hasSingleScheduledAction SingleScheduledAction +GRID-TEST-37;GRID-16;Remote management of meters;GridMeter hasSingleScheduledAction SingleScheduledAction GRID-TEST-38;GRID-17;Remote management of meters;SetOperation hasInput SetOperationObisInput GRID-TEST-39;GRID-17;Remote management of meters;SetOperationObisInput obtainInputFromObis string GRID-TEST-40;GRID-17;Remote management of meters;SetOperationObisInput hasInputObjectType string GRID-TEST-41;GRID-18;Remote management of meters;SingleScheduledAction executesScript Script GRID-TEST-42;GRID-18;Remote management of meters;SingleScheduledAction hasExecutionTime dateTime -GRID-TEST-43;GRID-19;Remote management of meters;Meter hasActivityCalendar ActivityCalendar -GRID-TEST-44;GRID-20;Remote management of meters;Meter hasActivityCalendar ActivityCalendar +GRID-TEST-43;GRID-19;Remote management of meters;GridMeter hasActivityCalendar ActivityCalendar +GRID-TEST-44;GRID-20;Remote management of meters;GridMeter hasActivityCalendar ActivityCalendar GRID-TEST-45;GRID-21;Remote management of meters;PowerLimit type MeterProperty GRID-TEST-46;GRID-22;Remote management of meters;PropertyValue hasValue string GRID-TEST-47;GRID-23;Remote management of meters;MeterProperty isMeasuredIn UnitOfMeasure -GRID-TEST-48;GRID-24;Remote management of meters;Meter hasService SetService -GRID-TEST-49;GRID-25;Remote management of meters;Meter hasService SetService -GRID-TEST-50;GRID-26;Remote management of meters;Meter measuresProperty EnergyAndPowerProperty +GRID-TEST-48;GRID-24;Remote management of meters;GridMeter hasService SetService +GRID-TEST-49;GRID-25;Remote management of meters;GridMeter hasService SetService +GRID-TEST-50;GRID-26;Remote management of meters;GridMeter measuresProperty EnergyAndPowerProperty GRID-TEST-51;GRID-26;Remote management of meters;EnergyAndPowerProperty isPropertyOf PowerLine GRID-TEST-52;GRID-26;Remote management of meters;ActiveEnergy type EnergyAndPowerProperty GRID-TEST-53;GRID-27;Remote management of meters;ActiveEnergy type EnergyAndPowerProperty @@ -58,16 +58,16 @@ GRID-TEST-56;GRID-30;Remote management of meters;EnergyAndPowerProperty isMeasur GRID-TEST-57;GRID-31;Remote management of meters;ActiveEnergy type EnergyAndPowerProperty GRID-TEST-58;GRID-31;Remote management of meters;ReactiveEnergy type EnergyAndPowerProperty GRID-TEST-59;GRID-32;Remote management of meters;Measurement hasTimestamp dateTime -GRID-TEST-60;GRID-33;Remote management of meters;Meter hasProfileGeneric ProfileGeneric +GRID-TEST-60;GRID-33;Remote management of meters;GridMeter hasProfileGeneric ProfileGeneric GRID-TEST-61;GRID-34;Remote management of meters;ProfileGeneric hasCapturePeriod integer GRID-TEST-62;GRID-34;Remote management of meters;ProfileGeneric relatedMeasurement Measurement -GRID-TEST-63;GRID-35;Remote management of meters;Meter hasService GetService +GRID-TEST-63;GRID-35;Remote management of meters;GridMeter hasService GetService GRID-TEST-64;GRID-36;Remote management of meters;ProfileGeneric hasCapturePeriod integer GRID-TEST-65;GRID-36;Remote management of meters;ProfileGeneric relatedMeasurement Measurement -GRID-TEST-66;GRID-37;Remote management of meters;Meter hasService GetService +GRID-TEST-66;GRID-37;Remote management of meters;GridMeter hasService GetService GRID-TEST-67;GRID-38;Remote management of meters;ProfileGeneric hasCapturePeriod integer GRID-TEST-68;GRID-38;Remote management of meters;ProfileGeneric relatedMeasurement Measurement -GRID-TEST-69;GRID-39;Remote management of meters;Meter hasService GetService +GRID-TEST-69;GRID-39;Remote management of meters;GridMeter hasService GetService GRID-TEST-70;GRID-40;Remote management of meters;ProfileGeneric hasCapturePeriod integer GRID-TEST-71;GRID-40;Remote management of meters;ProfileGeneric relatedMeasurement Measurement GRID-TEST-72;GRID-41;Remote management of meters;Threshold type MeterProperty @@ -77,59 +77,59 @@ GRID-TEST-75;GRID-44;Remote management of meters;MeterProperty isMeasuredIn Unit GRID-TEST-76;GRID-45;Remote management of meters;VoltageSagNumber type MeterProperty GRID-TEST-77;GRID-45;Remote management of meters;VoltageSwellNumber type MeterProperty GRID-TEST-78;GRID-45;Remote management of meters;LongPowerFailuresNumber type MeterProperty -GRID-TEST-79;GRID-46;Remote management of meters;Meter measuresProperty QualityProperty +GRID-TEST-79;GRID-46;Remote management of meters;GridMeter measuresProperty QualityProperty GRID-TEST-80;GRID-46;Remote management of meters;QualityProperty isPropertyOf PowerLine GRID-TEST-81;GRID-46;Remote management of meters;DurationVoltageSag type QualityProperty GRID-TEST-82;GRID-46;Remote management of meters;DurationVoltageSwell type QualityProperty GRID-TEST-83;GRID-46;Remote management of meters;DurationLongPowerFailure type QualityProperty GRID-TEST-84;GRID-47;Remote management of meters;QualityProperty isMeasuredIn UnitOfMeasure -GRID-TEST-85;GRID-48;Remote management of meters;Meter hasService GetService +GRID-TEST-85;GRID-48;Remote management of meters;GridMeter hasService GetService GRID-TEST-86;GRID-49;Remote management of meters;ProfileGeneric relatedMeasurement Measurement GRID-TEST-87;GRID-49;Remote management of meters;ProfileGeneric relatedPropertyValue PropertyValue -GRID-TEST-88;GRID-50;Remote management of meters;Meter hasService GetService +GRID-TEST-88;GRID-50;Remote management of meters;GridMeter hasService GetService GRID-TEST-89;GRID-51;Remote management of meters;ProfileGeneric relatedMeasurement Measurement GRID-TEST-90;GRID-51;Remote management of meters;ProfileGeneric relatedPropertyValue PropertyValue -GRID-TEST-91;GRID-54;Management of tertiary sensor devices;Meter hasService GetService +GRID-TEST-91;GRID-54;Management of tertiary sensor devices;GridMeter hasService GetService GRID-TEST-92;GRID-55;Management of tertiary sensor devices;Manufacturer type MeterProperty -GRID-TEST-93;GRID-56;Management of tertiary sensor devices;Meter hasFirmware Firmware +GRID-TEST-93;GRID-56;Management of tertiary sensor devices;GridMeter hasFirmware Firmware GRID-TEST-94;GRID-57;Management of tertiary sensor devices;Network type MeterProperty -GRID-TEST-95;GRID-58;Management of tertiary sensor devices;Meter hasSingleScheduledAction SingleScheduledAction -GRID-TEST-96;GRID-59;Management of tertiary sensor devices;Meter hasPropertyValue PropertyValue +GRID-TEST-95;GRID-58;Management of tertiary sensor devices;GridMeter hasSingleScheduledAction SingleScheduledAction +GRID-TEST-96;GRID-59;Management of tertiary sensor devices;GridMeter hasPropertyValue PropertyValue GRID-TEST-97;GRID-59;Management of tertiary sensor devices;PropertyValue hasProperty MeterProperty -GRID-TEST-98;GRID-61;Management of tertiary sensor devices;Meter hasService SetService +GRID-TEST-98;GRID-61;Management of tertiary sensor devices;GridMeter hasService SetService GRID-TEST-99;GRID-62;Management of tertiary sensor devices;SingleScheduledAction executesScript Script GRID-TEST-100;GRID-63;Management of tertiary sensor devices;SingleScheduledAction executesScript Script -GRID-TEST-101;GRID-64;Management of tertiary sensor devices;Meter hasService SetService -GRID-TEST-102;GRID-65;Management of tertiary sensor devices;Meter hasService GetService -GRID-TEST-103;GRID-67;Management of tertiary sensor devices;Meter hasService GetService -GRID-TEST-104;GRID-68;Management of tertiary sensor devices;Meter hasService GetService -GRID-TEST-105;GRID-69;Management of tertiary sensor devices;Meter hasProfileGeneric ProfileGeneric -GRID-TEST-106;GRID-70;Management of tertiary sensor devices;Meter hasProfileGeneric ProfileGeneric -GRID-TEST-107;GRID-71;Management of tertiary sensor devices;Meter hasProfileGeneric ProfileGeneric -GRID-TEST-108;GRID-72;Management of tertiary sensor devices;Meter hasProfileGeneric ProfileGeneric -GRID-TEST-109;GRID-73;Management of tertiary sensor devices;Meter hasProfileGeneric ProfileGeneric -GRID-TEST-110;GRID-74;Management of tertiary sensor devices;Meter hasProfileGeneric ProfileGeneric -GRID-TEST-111;GRID-75;Management of tertiary sensor devices;Meter hasProfileGeneric ProfileGeneric -GRID-TEST-112;GRID-76;Management of tertiary sensor devices;Meter hasProfileGeneric ProfileGeneric +GRID-TEST-101;GRID-64;Management of tertiary sensor devices;GridMeter hasService SetService +GRID-TEST-102;GRID-65;Management of tertiary sensor devices;GridMeter hasService GetService +GRID-TEST-103;GRID-67;Management of tertiary sensor devices;GridMeter hasService GetService +GRID-TEST-104;GRID-68;Management of tertiary sensor devices;GridMeter hasService GetService +GRID-TEST-105;GRID-69;Management of tertiary sensor devices;GridMeter hasProfileGeneric ProfileGeneric +GRID-TEST-106;GRID-70;Management of tertiary sensor devices;GridMeter hasProfileGeneric ProfileGeneric +GRID-TEST-107;GRID-71;Management of tertiary sensor devices;GridMeter hasProfileGeneric ProfileGeneric +GRID-TEST-108;GRID-72;Management of tertiary sensor devices;GridMeter hasProfileGeneric ProfileGeneric +GRID-TEST-109;GRID-73;Management of tertiary sensor devices;GridMeter hasProfileGeneric ProfileGeneric +GRID-TEST-110;GRID-74;Management of tertiary sensor devices;GridMeter hasProfileGeneric ProfileGeneric +GRID-TEST-111;GRID-75;Management of tertiary sensor devices;GridMeter hasProfileGeneric ProfileGeneric +GRID-TEST-112;GRID-76;Management of tertiary sensor devices;GridMeter hasProfileGeneric ProfileGeneric GRID-TEST-113;GRID-77;Management of tertiary sensor devices;Manufacturer type MeterProperty -GRID-TEST-114;GRID-78;Management of tertiary sensor devices;Meter hasFirmware Firmware +GRID-TEST-114;GRID-78;Management of tertiary sensor devices;GridMeter hasFirmware Firmware GRID-TEST-115;GRID-79;Management of tertiary sensor devices;Network type MeterProperty -GRID-TEST-116;GRID-80;Management of tertiary sensor devices;Meter hasService GetService -GRID-TEST-117;GRID-81;Management of tertiary sensor devices;Meter hasService GetService -GRID-TEST-118;GRID-82;Management of tertiary sensor devices;Meter hasService SetService -GRID-TEST-119;GRID-83;Management of tertiary sensor devices;Meter hasService GetService -GRID-TEST-120;GRID-84;Management of tertiary sensor devices;Meter hasService SetService -GRID-TEST-121;GRID-87;Management of tertiary sensor devices;Meter hasService GetService +GRID-TEST-116;GRID-80;Management of tertiary sensor devices;GridMeter hasService GetService +GRID-TEST-117;GRID-81;Management of tertiary sensor devices;GridMeter hasService GetService +GRID-TEST-118;GRID-82;Management of tertiary sensor devices;GridMeter hasService SetService +GRID-TEST-119;GRID-83;Management of tertiary sensor devices;GridMeter hasService GetService +GRID-TEST-120;GRID-84;Management of tertiary sensor devices;GridMeter hasService SetService +GRID-TEST-121;GRID-87;Management of tertiary sensor devices;GridMeter hasService GetService GRID-TEST-122;GRID-88;Management of tertiary sensor devices;Manufacturer type MeterProperty -GRID-TEST-123;GRID-89;Management of tertiary sensor devices;Meter hasFirmware Firmware -GRID-TEST-124;GRID-90;Management of tertiary sensor devices;Meter hasSingleScheduledAction SingleScheduledAction -GRID-TEST-125;GRID-91;Management of tertiary sensor devices;Meter hasPropertyValue PropertyValue +GRID-TEST-123;GRID-89;Management of tertiary sensor devices;GridMeter hasFirmware Firmware +GRID-TEST-124;GRID-90;Management of tertiary sensor devices;GridMeter hasSingleScheduledAction SingleScheduledAction +GRID-TEST-125;GRID-91;Management of tertiary sensor devices;GridMeter hasPropertyValue PropertyValue GRID-TEST-126;GRID-91;Management of tertiary sensor devices;PropertyValue hasProperty MeterProperty -GRID-TEST-127;GRID-93;Management of tertiary sensor devices;Meter hasService SetService -GRID-TEST-128;GRID-94;Management of tertiary sensor devices;Meter hasService GetService -GRID-TEST-129;GRID-95;Management of tertiary sensor devices;Meter hasService SetService -GRID-TEST-130;GRID-96;Management of tertiary sensor devices;Meter hasService GetService -GRID-TEST-131;GRID-97;Management of tertiary sensor devices;Meter hasService GetService +GRID-TEST-127;GRID-93;Management of tertiary sensor devices;GridMeter hasService SetService +GRID-TEST-128;GRID-94;Management of tertiary sensor devices;GridMeter hasService GetService +GRID-TEST-129;GRID-95;Management of tertiary sensor devices;GridMeter hasService SetService +GRID-TEST-130;GRID-96;Management of tertiary sensor devices;GridMeter hasService GetService +GRID-TEST-131;GRID-97;Management of tertiary sensor devices;GridMeter hasService GetService GRID-TEST-132;GRID-99;Management of OLTC transformers;Current type EnergyAndPowerProperty GRID-TEST-133;GRID-99;Management of OLTC transformers;Voltage type EnergyAndPowerProperty GRID-TEST-134;GRID-99;Management of OLTC transformers;ActivePower type EnergyAndPowerProperty @@ -140,36 +140,36 @@ GRID-TEST-138;GRID-100;Management of OLTC transformers;ActivePower type EnergyAn GRID-TEST-139;GRID-100;Management of OLTC transformers;ReactivePower type EnergyAndPowerProperty GRID-TEST-140;GRID-101;Management of OLTC transformers;Voltage type EnergyAndPowerProperty GRID-TEST-141;GRID-102;Management of OLTC transformers;Voltage type EnergyAndPowerProperty -GRID-TEST-142;GRID-103;Management of OLTC transformers;Meter hasService GetService +GRID-TEST-142;GRID-103;Management of OLTC transformers;GridMeter hasService GetService GRID-TEST-143;GRID-104;Management of OLTC transformers;ProfileGeneric relatedMeasurement Measurement -GRID-TEST-144;GRID-105;Management of OLTC transformers;Meter hasService GetService +GRID-TEST-144;GRID-105;Management of OLTC transformers;GridMeter hasService GetService GRID-TEST-145;GRID-106;Management of OLTC transformers;ProfileGeneric relatedMeasurement Measurement GRID-TEST-146;GRID-106;Management of OLTC transformers;ProfileGeneric hasCapturePeriod integer -GRID-TEST-147;GRID-107;Management of OLTC transformers;Meter hasService GetService +GRID-TEST-147;GRID-107;Management of OLTC transformers;GridMeter hasService GetService GRID-TEST-148;GRID-108;Management of OLTC transformers;ProfileGeneric relatedMeasurement Measurement GRID-TEST-149;GRID-108;Management of OLTC transformers;ProfileGeneric hasCapturePeriod integer -GRID-TEST-150;GRID-109;Management of OLTC transformers;Meter hasService GetService +GRID-TEST-150;GRID-109;Management of OLTC transformers;GridMeter hasService GetService GRID-TEST-151;GRID-110;Management of OLTC transformers;ProfileGeneric relatedMeasurement Measurement GRID-TEST-152;GRID-110;Management of OLTC transformers;ProfileGeneric hasCapturePeriod integer -GRID-TEST-153;GRID-111;Management of OLTC transformers;Meter hasService GetService +GRID-TEST-153;GRID-111;Management of OLTC transformers;GridMeter hasService GetService GRID-TEST-154;GRID-112;Management of OLTC transformers;ProfileGeneric relatedMeasurement Measurement GRID-TEST-155;GRID-112;Management of OLTC transformers;ProfileGeneric hasCapturePeriod integer -GRID-TEST-156;GRID-113;Management of OLTC transformers;Meter hasService GetService +GRID-TEST-156;GRID-113;Management of OLTC transformers;GridMeter hasService GetService GRID-TEST-157;GRID-114;Management of OLTC transformers;ProfileGeneric relatedMeasurement Measurement GRID-TEST-158;GRID-114;Management of OLTC transformers;ProfileGeneric hasCapturePeriod integer -GRID-TEST-159;GRID-115;Management of OLTC transformers;Meter hasService GetService +GRID-TEST-159;GRID-115;Management of OLTC transformers;GridMeter hasService GetService GRID-TEST-160;GRID-116;Management of OLTC transformers;ProfileGeneric relatedMeasurement Measurement GRID-TEST-161;GRID-116;Management of OLTC transformers;ProfileGeneric hasCapturePeriod integer -GRID-TEST-162;GRID-117;Management of OLTC transformers;Meter hasService GetService -GRID-TEST-163;GRID-118;Management of OLTC transformers;Meter hasService GetService +GRID-TEST-162;GRID-117;Management of OLTC transformers;GridMeter hasService GetService +GRID-TEST-163;GRID-118;Management of OLTC transformers;GridMeter hasService GetService GRID-TEST-164;GRID-119;Management of OLTC transformers;ProfileGeneric relatedMeasurement Measurement GRID-TEST-165;GRID-119;Management of OLTC transformers;ProfileGeneric hasCapturePeriod integer -GRID-TEST-166;GRID-120;Detection of meters connectivity;Meter hasState BreakerState -GRID-TEST-167;GRID-121;Detection of meters connectivity;Meter hasState BreakerState -GRID-TEST-168;GRID-122;Detection of meters connectivity;Meter hasProfileGeneric ProfileGeneric -GRID-TEST-169;GRID-123;Detection of meters connectivity;Meter hasService GetService -GRID-TEST-170;GRID-124;Detection of meters connectivity;Meter hasProfileGeneric ProfileGeneric -GRID-TEST-171;GRID-124;Detection of meters connectivity;Meter hasService GetService +GRID-TEST-166;GRID-120;Detection of meters connectivity;GridMeter hasState BreakerState +GRID-TEST-167;GRID-121;Detection of meters connectivity;GridMeter hasState BreakerState +GRID-TEST-168;GRID-122;Detection of meters connectivity;GridMeter hasProfileGeneric ProfileGeneric +GRID-TEST-169;GRID-123;Detection of meters connectivity;GridMeter hasService GetService +GRID-TEST-170;GRID-124;Detection of meters connectivity;GridMeter hasProfileGeneric ProfileGeneric +GRID-TEST-171;GRID-124;Detection of meters connectivity;GridMeter hasService GetService GRID-TEST-172;GRID-125;Detection of meters connectivity;ProfileGeneric relatedMeasurement Measurement GRID-TEST-173;GRID-125;Detection of meters connectivity;ProfileGeneric hasCapturePeriod integer -GRID-TEST-174;GRID-126;Detection of meters connectivity;Meter hasService GetService +GRID-TEST-174;GRID-126;Detection of meters connectivity;GridMeter hasService GetService