Unverified Commit fca1ce8a authored by Maxime Lefrançois's avatar Maxime Lefrançois
Browse files

Merge branch 'develop-v4.1.1' of labs.etsi.org:saref/saref-core into develop-v4.1.1

parents 844c724c be69fe29
Loading
Loading
Loading
Loading
+28 −8
Original line number Diff line number Diff line
@@ -16,18 +16,38 @@
    dcterms:title "Example commodities"@en ;
    dcterms:description "Example commodities"@en .

ex:Electricity a saref:EnergyCommodity ;
    rdfs:comment "A type of energy commodity"@en ;

## Examples of commodity categories: energy commodities that groups electricity, gas, propane (narrower than gas), coal, and natural resource commodities.

ex:EnergyCommodity a owl:Class ;
    rdfs:subClassOf saref:Commodity ;
    rdfs:label "Energy Commodity"@en ;
    rdfs:comment "The class of energy commodities"@en .

ex:NaturalResourceCommodity a owl:Class ;
    rdfs:subClassOf saref:Commodity ;
    rdfs:label "Natural Resource Commodity"@en ;
    rdfs:comment "The class of natural resource commodities"@en .

## Example commodities

ex:Electricity a ex:EnergyCommodity ;
    rdfs:comment "The electricity energy commodity"@en ;
    rdfs:label "Electricity"@en .

ex:Gas a saref:EnergyCommodity , saref:NaturalResourceCommodity ;
    rdfs:comment "A type of energy commodity"@en ;
ex:Gas a ex:EnergyCommodity ;
    rdfs:comment "The gas energy commodity"@en ;
    rdfs:label "Gas"@en .

ex:Coal a saref:EnergyCommodity , saref:NaturalResourceCommodity ;
    rdfs:comment "A type of commodity"@en ;
ex:Propane a ex:EnergyCommodity ;
    skos:broader ex:Gas ;
    rdfs:comment "The propane energy commodity"@en ;
    rdfs:label "Propane"@en .

ex:Coal a ex:EnergyCommodity ;
    rdfs:comment "The coal energy commodity"@en ;
    rdfs:label "Coal"@en .

ex:Water a saref:NaturalResourceCommodity ;
    rdfs:comment "A type of commodity"@en ;
ex:Water a ex:NaturalResourceCommodity ;
    rdfs:comment "The water natural resource commodity"@en ;
    rdfs:label "Water"@en .
+3 −39
Original line number Diff line number Diff line
@@ -451,9 +451,10 @@ saref:Appliance a owl:Class ;

saref:Sensor a owl:Class ;
    rdfs:subClassOf saref:Device ;
    rdfs:comment "A device designed to observe one or more properties or states of one or more features of interest."@en ;
    rdfs:comment "A device designed to observe and measure one or more properties or states of one or more features of interest."@en ;
    rdfs:label "Sensor"@en ;
    rdfs:subClassOf [ a owl:Restriction ; owl:onProperty saref:observes ; owl:minCardinality 1 ] ;
    skos:historyNote "V4.1.1: Definition of Sensor and Meter are updated to better distinguish one from the other."@en ;
    skos:historyNote "V3.2.1: Definition of Sensor is simplified and grounded on saref:observes. Local restriction on saref:hasFunction is deleted."@en .

saref:Actuator a owl:Class ;
@@ -469,6 +470,7 @@ saref:Meter a owl:Class ;
    rdfs:comment "A device designed to observe and additionally do some computation and/or display one or more properties of one or more features of interest."@en ;
    rdfs:label "Meter"@en ;
    rdfs:subClassOf [ a owl:Restriction ; owl:onProperty saref:observes ; owl:minCardinality 1 ] ;
    skos:historyNote "V4.1.1: Definition of Sensor and Meter are updated to better distinguish one from the other."@en ;
    skos:historyNote "V3.2.1: Definition of Meter is simplified and grounded on saref:observes. Local restriction on saref:hasFunction is deleted."@en .


@@ -529,44 +531,6 @@ saref:Commodity rdfs:subClassOf
            owl:onProperty skos:narrower ;
            owl:allValuesFrom saref:Commodity ] .


## SAREF Core defines the category of energy commodities that groups electricity, gas, propane (narrower than gas), coal. It furthermore defines the category of natural resource commodity.

saref:EnergyCommodity a owl:Class ;
    rdfs:subClassOf saref:Commodity ;
    rdfs:label "Energy Commodity"@en ;
    rdfs:comment "The class of energy commodities"@en ;
    skos:historyNote "V3.2.1: New category of commodities saref:EnergyCommodity"@en .

saref:NaturalResourceCommodity a owl:Class ;
    rdfs:subClassOf saref:Commodity ;
    rdfs:label "Natural Resource Commodity"@en ;
    rdfs:comment "The class of natural resource commodities"@en ;
    skos:historyNote "V3.2.1: New category of commodities saref:NaturalResourceCommodity"@en .

## the following entities will be introduced in the next major revision of SAREF

saref:Electricity a saref:EnergyCommodity ;
    rdfs:comment "The electricity energy commodity"@en ;
    rdfs:label "Electricity"@en .

saref:Gas a saref:EnergyCommodity ;
    rdfs:comment "The gas energy commodity"@en ;
    rdfs:label "Gas"@en .

saref:Propane a saref:EnergyCommodity ;
    skos:broader saref:Gas ;
    rdfs:comment "The propane energy commodity"@en ;
    rdfs:label "Propane"@en .

saref:Coal a saref:EnergyCommodity ;
    rdfs:comment "The coal energy commodity"@en ;
    rdfs:label "Coal"@en .

saref:Water a saref:NaturalResourceCommodity ;
    rdfs:comment "The water natural resource commodity"@en ;
    rdfs:label "Water"@en .

## isUsedFor

saref:isUsedFor a owl:ObjectProperty ;