Commit a52fa5f4 authored by Raul Garcia-Castro's avatar Raul Garcia-Castro
Browse files

Merge branch 'issue-1' into 'develop-v2.1.1' 

Updated to use saref:PropertyValue

Closes #1

See merge request !5
parents 052d87f6 13362e36

documentation/description.html

+3 −3
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 


	<p>For this reason, the characteristics of the meter are represented as properties that are not observable by the meter (<a href="#s4grid:MeterProperty">s4grid:MeterProperty</a>, 

	fully represented in <a href="#Figure_6">Figure 6</a>), i.e., they are not measurements (<a href="https://saref.etsi.org/core/Measurement">saref:Measurement</a>).

		The properties of a meter are defined by a value (<a href="#s4grid:PropertyValue">s4grid:PropertyValue</a>) and some are complemented with a unit of measurement 

		The properties of a meter are defined by a value (<a href="https://saref.etsi.org/core/PropertyValue">saref:PropertyValue</a>) and some are complemented with a unit of measurement 

		(<a href="https://saref.etsi.org/core/UnitOfMeasure">saref:UnitOfMeasure</a>).</p>



	<figure>
@@ -238,8 +238,8 @@ 
	  <a href="#s4grid:ProfileGeneric">s4grid:ProfileGeneric</a> class, as presented in <a href="#Figure_16">Figure 16</a>. 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.</p>



	<p>A profile generic is represented by the objects that it captures (<a href="#s4grid:Clock">s4grid:Clock</a>, <a href="#s4grid:PropertyValues">s4grid:PropertyValues</a> and 

	  <a href="#s4grid:Measurements">s4grid:Measurements</a>). These capture objects are collected in each period defined in the 

	<p>A profile generic is represented by the objects that it captures (<a href="#s4grid:Clock">s4grid:Clock</a>, <a href="https://saref.etsi.org/core/PropertyValue">saref:PropertyValues</a> and 

	  <a href="https://saref.etsi.org/core/Measurement">saref:Measurements</a>). These capture objects are collected in each period defined in the 

	  <a href="#s4grid:hasCapturePeriod">s4grid:hasCapturePeriod</a> property.</p>



	<figure>

examples/ProfileGeneric.ttl

+4 −4
Original line number Diff line number Diff line
@@ -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 ;

examples/PropertyValues.ttl

+13 −13
Original line number Diff line number Diff line
@@ -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 ;

examples/Set.ttl

+1 −1
Original line number Diff line number Diff line
@@ -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 ;

ontology/saref4grid.ttl

+3 −30
Original line number Diff line number Diff line
@@ -260,18 +260,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 ;
@@ -320,12 +308,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 ;
@@ -342,7 +324,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 ;
@@ -569,11 +551,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 ;
@@ -848,8 +825,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 ;
@@ -885,10 +862,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 ;