diff --git a/documentation/description.html b/documentation/description.html
index 3b20e6ca96fc401da2df4c0a12eccef8cea4b3f1..075511724388f6736dcb92ff8dae4b94e01b1cce 100644
--- a/documentation/description.html
+++ b/documentation/description.html
@@ -44,7 +44,7 @@
For this reason, the characteristics of the meter are represented as properties that are not observable by the meter (s4grid:MeterProperty ,
fully represented in Figure 6 ), i.e., they are not measurements (saref:Measurement ).
- The properties of a meter are defined by a value (s4grid:PropertyValue ) and some are complemented with a unit of measurement
+ The properties of a meter are defined by a value (saref:PropertyValue ) and some are complemented with a unit of measurement
(saref:UnitOfMeasure ).
@@ -238,8 +238,8 @@
s4grid:ProfileGeneric class, as presented in Figure 16 . Capture objects are specific attributes or elements of (an) attribute(s) of COSEM objects.
The capture objects are collected periodically or occasionally. The representation of the profile generic of a meter has been extracted from the IEC 62056-6-2:2017.
- A profile generic is represented by the objects that it captures (s4grid:Clock , s4grid:PropertyValues and
- s4grid:Measurements ). These capture objects are collected in each period defined in the
+
A profile generic is represented by the objects that it captures (s4grid:Clock , saref:PropertyValues and
+ saref:Measurements ). These capture objects are collected in each period defined in the
s4grid:hasCapturePeriod property.
diff --git a/examples/ProfileGeneric.ttl b/examples/ProfileGeneric.ttl
index 1b3531ab6b059f01b27b9f8e91ed0c821cd3ee5a..761ea45234f5a14b129b960ce41466977038acf4 100644
--- a/examples/ProfileGeneric.ttl
+++ b/examples/ProfileGeneric.ttl
@@ -22,7 +22,7 @@
# Object Properties
#################################################################
-s4grid:hasProperty a owl:ObjectProperty .
+saref:isValueOfProperty a owl:ObjectProperty .
s4grid:hasProfileGeneric a owl:ObjectProperty .
@@ -74,7 +74,7 @@ s4grid:Clock a owl:Class .
s4grid:GridMeter a owl:Class .
-s4grid:PropertyValue a owl:Class .
+saref:PropertyValue a owl:Class .
saref:Property a owl:Class .
@@ -181,9 +181,9 @@ s4grid:ProfileStatus a s4grid:MeterProperty,
owl:NamedIndividual ;
skos:narrower ex:AMRStatusLoadProfilePeriod1-1234 .
-ex:PropertyValue1 a s4grid:PropertyValue,
+ex:PropertyValue1 a saref:PropertyValue,
owl:NamedIndividual ;
- s4grid:hasProperty ex:AMRStatusLoadProfilePeriod1-1234 .
+ saref:isValueOfProperty ex:AMRStatusLoadProfilePeriod1-1234 .
ex:TotalIncrementalActiveEnergyExport1234 a s4grid:EnergyAndPowerProperty,
owl:NamedIndividual ;
diff --git a/examples/PropertyValues.ttl b/examples/PropertyValues.ttl
index d81c1c53be5c44b6c8d0c02db93a47a1c878694e..7666720a64ce6531a41d0c8255b05ba2dcbf8a6b 100644
--- a/examples/PropertyValues.ttl
+++ b/examples/PropertyValues.ttl
@@ -21,11 +21,11 @@
# Object Properties
#################################################################
-s4grid:hasPropertyValue a owl:ObjectProperty .
+saref:hasPropertyValue a owl:ObjectProperty .
-s4grid:hasProperty a owl:ObjectProperty .
+saref:isValueOfProperty a owl:ObjectProperty .
-s4grid:hasUnit a owl:ObjectProperty .
+saref:isMeasuredIn a owl:ObjectProperty .
skos:broader a owl:ObjectProperty .
@@ -38,7 +38,7 @@ skos:narrower a owl:ObjectProperty .
s4grid:hasObis a owl:DatatypeProperty .
-s4grid:hasValue a owl:DatatypeProperty .
+saref:hasValue a owl:DatatypeProperty .
#################################################################
@@ -49,7 +49,7 @@ saref:UnitOfMeasure a owl:Class .
s4grid:GridMeter a owl:Class .
-s4grid:PropertyValue a owl:Class .
+saref:PropertyValue a owl:Class .
saref:Property a owl:Class .
@@ -62,13 +62,13 @@ s4grid:MeterProperty a owl:Class ;
ex:Meter1234 a s4grid:GridMeter,
owl:NamedIndividual ;
- s4grid:hasPropertyValue ex:PropertyValue234,
+ saref:hasPropertyValue ex:PropertyValue234,
ex:PropertyValue678.
-ex:PropertyValue678 a s4grid:PropertyValue,
+ex:PropertyValue678 a saref:PropertyValue,
owl:NamedIndividual ;
- s4grid:hasProperty ex:ScrollDisplayMode ;
- s4grid:hasValue "224.0.1.0"^^xsd:string .
+ saref:isValueOfProperty ex:ScrollDisplayMode ;
+ saref:hasValue "224.0.1.0"^^xsd:string .
ex:ActivePowerLimitContract1TariffPeriod1 a s4grid:MeterProperty,
owl:NamedIndividual ;
@@ -82,11 +82,11 @@ s4grid:ScreenDisplay a s4grid:MeterProperty,
om:watt a saref:UnitOfMeasure,
owl:NamedIndividual .
-ex:PropertyValue234 a s4grid:PropertyValue,
+ex:PropertyValue234 a saref:PropertyValue,
owl:NamedIndividual ;
- s4grid:hasProperty ex:ActivePowerLimitContract1TariffPeriod1 ;
- s4grid:hasValue "1200"^^xsd:int ;
- s4grid:hasUnit om:watt .
+ saref:isValueOfProperty ex:ActivePowerLimitContract1TariffPeriod1 ;
+ saref:hasValue "1200"^^xsd:int ;
+ saref:isMeasuredIn om:watt .
s4grid:PowerLimit a s4grid:MeterProperty,
owl:NamedIndividual ;
diff --git a/examples/Set.ttl b/examples/Set.ttl
index b4c40ab6f5025bbead2d5a6be95eeee6fb360a34..2285e4f90352fd1b3e51a840bbebb84fc6eb1855 100644
--- a/examples/Set.ttl
+++ b/examples/Set.ttl
@@ -79,7 +79,7 @@ ex:SetOperationMulticastCommunicationIdentifier a s4grid:SetOperation,
ex:InputMulticastCommunicationIdentifier a s4grid:SetOperationObisInput,
owl:NamedIndividual ;
s4grid:obtainInputFromObis "0-0:96.1.5.255"^^xsd:string ;
- s4grid:hasInputObjectType "s4grid:PropertyValue"^^xsd:string .
+ s4grid:hasInputObjectType "saref:PropertyValue"^^xsd:string .
ex:SetServiceCapturePeriodIncrementalLoadProfile a s4grid:SetService,
owl:NamedIndividual ;
diff --git a/ontology/saref4grid.ttl b/ontology/saref4grid.ttl
index 6c346da4cd46ca80b3d63c4b48b8eb8916ebb3cf..c05997c8e0bf0d6aaf57b035703a5d24d380ff15 100644
--- a/ontology/saref4grid.ttl
+++ b/ontology/saref4grid.ttl
@@ -272,18 +272,6 @@ s4grid:hasProfileGeneric a owl:ObjectProperty ;
rdfs:domain s4grid:GridMeter ;
rdfs:range s4grid:ProfileGeneric .
-s4grid:hasProperty a owl:ObjectProperty ;
- rdfs:comment "A relationship between a property value and the property it relates to"@en ;
- rdfs:label "has property"@en ;
- rdfs:domain s4grid:PropertyValue ;
- rdfs:range saref:Property .
-
-s4grid:hasPropertyValue a owl:ObjectProperty ;
- rdfs:comment "The property value of a meter"@en ;
- rdfs:label "has property value"@en ;
- rdfs:domain s4grid:GridMeter ;
- rdfs:range s4grid:PropertyValue .
-
s4grid:hasSaturdayProfile a owl:ObjectProperty ;
rdfs:comment "It defines the day profile valid each Saturday of the season"@en ;
rdfs:label "has saturday profile"@en ;
@@ -332,12 +320,6 @@ s4grid:hasWednesdayProfile a owl:ObjectProperty ;
rdfs:label "has wednesday profile"@en ;
rdfs:subPropertyOf s4grid:hasDayProfile .
-s4grid:hasUnit a owl:ObjectProperty ;
- rdfs:comment "A relationship identifying the unit of measure used for a certain property value"@en ;
- rdfs:label "has unit"@en ;
- rdfs:domain s4grid:PropertyValue ;
- rdfs:range saref:UnitOfMeasure .
-
s4grid:relatedClock a owl:ObjectProperty ;
rdfs:comment "The clock that is captured by a profile generic"@en ;
rdfs:label "related clock"@en ;
@@ -354,7 +336,7 @@ s4grid:relatedPropertyValue a owl:ObjectProperty ;
rdfs:comment "The property value that is captured by a profile generic"@en ;
rdfs:label "related property value"@en ;
rdfs:domain s4grid:ProfileGeneric ;
- rdfs:range s4grid:PropertyValue .
+ rdfs:range saref:PropertyValue .
s4grid:storesScript a owl:ObjectProperty ;
rdfs:comment "[COSEM] Specifies the different scripts which are stored in a script table"@en ;
@@ -581,11 +563,6 @@ s4grid:hasValidityIntervalStart a owl:DatatypeProperty ;
rdfs:domain s4grid:PresetAdjustingTime ;
rdfs:range xsd:dateTime .
-s4grid:hasValue a owl:DatatypeProperty ;
- rdfs:comment "A relationship defining the value of a certain property which is not observable by the meter"@en ;
- rdfs:label "has value"@en ;
- rdfs:domain s4grid:PropertyValue .
-
s4grid:hasVendorId a owl:DatatypeProperty ;
rdfs:comment "[COSEM] Unique vendor identifier assigned by the PRIME Alliance"@en ;
rdfs:label "has vendor id"@en ;
@@ -864,8 +841,8 @@ s4grid:GridMeter a owl:Class ;
rdfs:subClassOf [ a owl:Restriction ;
owl:allValuesFrom [ a owl:Restriction ;
owl:allValuesFrom s4grid:MeterProperty ;
- owl:onProperty s4grid:hasProperty ] ;
- owl:onProperty s4grid:hasPropertyValue ],
+ owl:onProperty saref:isValueOfProperty ] ;
+ owl:onProperty saref:hasPropertyValue ],
saref:Meter .
s4grid:NetworkInterface a owl:Class ;
@@ -901,10 +878,6 @@ s4grid:ProfileGeneric a owl:Class ;
owl:cardinality "1"^^xsd:nonNegativeInteger ;
owl:onProperty s4grid:hasCapturePeriod ] .
-s4grid:PropertyValue a owl:Class ;
- rdfs:comment "A value (which may have a unit of measurement) that is related to a property which is not observable by the meter (i.e., is not a measurement)"@en ;
- rdfs:label "Property Value"@en .
-
s4grid:QualityProperty a owl:Class ;
rdfs:comment "Class to group those properties related to the quality of power lines"@en ;
rdfs:label "Quality Property"@en ;