Merge branch 'issue-3' into 'master'

Deleted terms not used in the extensions

Closes #3

See merge request !31

ontology/saref.ttl

@@ -337,12 +337,6 @@ saref:hasModel rdf:type owl:DatatypeProperty ;
                rdfs:label "has model"@en .
 
 
-###  https://saref.etsi.org/saref#hasName
-saref:hasName rdf:type owl:DatatypeProperty ;
-              rdfs:comment "A relationship providing the name of an entity (e.g., device). The value is expected to be a string or a string with language tag."@en ;
-              rdfs:label "has name"@en .
-
-
 ###  https://saref.etsi.org/saref#hasTimestamp
 saref:hasTimestamp rdf:type owl:DatatypeProperty ;
                    rdfs:comment "A relationship stating the timestamp of an entity (e.g. a measurement)."@en ;
@@ -369,7 +363,7 @@ saref:ActuatingFunction rdf:type owl:Class ;
 
 ###  https://saref.etsi.org/saref#Actuator
 saref:Actuator rdf:type owl:Class ;
-               rdfs:subClassOf saref:FunctionRelated ,
+               rdfs:subClassOf saref:Device ,
                                [ rdf:type owl:Restriction ;
                                  owl:onProperty saref:hasFunction ;
                                  owl:someValuesFrom saref:ActuatingFunction
@@ -380,18 +374,11 @@ saref:Actuator rdf:type owl:Class ;
 
 ###  https://saref.etsi.org/saref#Appliance
 saref:Appliance rdf:type owl:Class ;
-                rdfs:subClassOf saref:FunctionRelated ;
+                rdfs:subClassOf saref:Device ;
                 rdfs:comment "An electrical/mechanical machine that accomplish some household functions, such as cleaning or cooking"@en ;
                 rdfs:label "Appliance"@en .
 
 
-###  https://saref.etsi.org/saref#BuildingRelated
-saref:BuildingRelated rdf:type owl:Class ;
-                      rdfs:subClassOf saref:Device ;
-                      rdfs:comment "A category that includes devices as described by building related data models, such as IFC and FIEMSER "@en ;
-                      rdfs:label "Building related"@en .
-
-
 ###  https://saref.etsi.org/saref#CloseCommand
 saref:CloseCommand rdf:type owl:Class ;
                    rdfs:subClassOf saref:Command ,
@@ -502,7 +489,7 @@ saref:Device rdf:type owl:Class ;
                                owl:onProperty saref:hasModel ;
                                owl:maxCardinality "1"^^xsd:nonNegativeInteger
                              ] ;
-             rdfs:comment "A tangible object designed to accomplish a particular task in households, common public buildings or offices. In order to accomplish this task, the device performs one or more functions. For example, a washing machine is designed to wash (task) and to accomplish this task it performs a start and stop function. Devices can be structured in categories (subclasses) that reflect the different domain in which a device is used, e.g., smart appliances domain (subclass FunctionRelated) vs. building domain (subclass BuildingRelated) vs. smart grid domain (subclass EnergyRelated). New categories can be defined,if needed, to reflect other differences, for example different points of view, such as the point of view of the device's user vs. the point of view of the device's manufacturer. We propose a list of devices that are relevant for the purpose of SAREF, but this list can be extended."@en ;
+             rdfs:comment "A tangible object designed to accomplish a particular task. In order to accomplish this task, the device performs one or more functions. For example, a washing machine is designed to wash (task) and to accomplish this task it performs a start and stop function."@en ;
              rdfs:label "Device"@en .
 
 
@@ -535,24 +522,6 @@ saref:Energy rdf:type owl:Class ;
              rdfs:label "Energy"@en .
 
 
-###  https://saref.etsi.org/saref#EnergyMeter
-saref:EnergyMeter rdf:type owl:Class ;
-                  rdfs:subClassOf saref:Meter ,
-                                  [ rdf:type owl:Restriction ;
-                                    owl:onProperty saref:measuresProperty ;
-                                    owl:someValuesFrom saref:Energy
-                                  ] ;
-                  rdfs:comment "An energy meter is a meter that performs the saref:MeteringFunction and is used for the purpose of measuring the saref:Energy property. A saref:EnergyMeter is typically used to accomplish saref:EnergyEfficiency, and saref:MeterReading."@en ;
-                  rdfs:label "Energy meter"@en .
-
-
-###  https://saref.etsi.org/saref#EnergyRelated
-saref:EnergyRelated rdf:type owl:Class ;
-                    rdfs:subClassOf saref:Device ;
-                    rdfs:comment "A category that considers devices based on energy consumption information and profiles to optimize energy efficiency."@en ;
-                    rdfs:label "Energy related"@en .
-
-
 ###  https://saref.etsi.org/saref#EnergyUnit
 saref:EnergyUnit rdf:type owl:Class ;
                  rdfs:subClassOf saref:UnitOfMeasure ;
@@ -597,13 +566,6 @@ saref:Function rdf:type owl:Class ;
                rdfs:label "Function"@en .
 
 
-###  https://saref.etsi.org/saref#FunctionRelated
-saref:FunctionRelated rdf:type owl:Class ;
-                      rdfs:subClassOf saref:Device ;
-                      rdfs:comment "A category that considers devices, sensors and their specification in terms of functions, states and services"@en ;
-                      rdfs:label "Function related"@en .
-
-
 ###  https://saref.etsi.org/saref#Gas
 saref:Gas rdf:type owl:Class ;
           rdfs:subClassOf saref:Commodity ;
@@ -611,13 +573,6 @@ saref:Gas rdf:type owl:Class ;
           rdfs:label "Gas"@en .
 
 
-###  https://saref.etsi.org/saref#Generator
-saref:Generator rdf:type owl:Class ;
-                rdfs:subClassOf saref:EnergyRelated ;
-                rdfs:comment "A type of energy-related device that generates energy"@en ;
-                rdfs:label "Generator"@en .
-
-
 ###  https://saref.etsi.org/saref#GetCommand
 saref:GetCommand rdf:type owl:Class ;
                  rdfs:subClassOf saref:Command ;
@@ -671,7 +626,7 @@ saref:GetSensingDataCommand rdf:type owl:Class ;
 
 ###  https://saref.etsi.org/saref#HVAC
 saref:HVAC rdf:type owl:Class ;
-           rdfs:subClassOf saref:FunctionRelated ;
+           rdfs:subClassOf saref:Device ;
            rdfs:comment "Heating, Ventilation and Air Conditioning (HVAC) device that provides indoor environmental comfort. A saref:HVAC is typically used to accomplish saref:Comfort."@en ;
            rdfs:label "HVAC"@en .
 
@@ -727,13 +682,6 @@ saref:LightSwitch rdf:type owl:Class ;
                   rdfs:label "Light switch"@en .
 
 
-###  https://saref.etsi.org/saref#Load
-saref:Load rdf:type owl:Class ;
-           rdfs:subClassOf saref:EnergyRelated ;
-           rdfs:comment "A type of energy-related device that consumes energy"@en ;
-           rdfs:label "Load"@en .
-
-
 ###  https://saref.etsi.org/saref#Measurement
 saref:Measurement rdf:type owl:Class ;
                   rdfs:subClassOf [ rdf:type owl:Restriction ;
@@ -772,7 +720,7 @@ saref:Measurement rdf:type owl:Class ;
 
 ###  https://saref.etsi.org/saref#Meter
 saref:Meter rdf:type owl:Class ;
-            rdfs:subClassOf saref:FunctionRelated ,
+            rdfs:subClassOf saref:Device ,
                             [ rdf:type owl:Restriction ;
                               owl:onProperty saref:hasFunction ;
                               owl:someValuesFrom saref:MeteringFunction
@@ -1034,7 +982,7 @@ saref:SensingFunction rdf:type owl:Class ;
 
 ###  https://saref.etsi.org/saref#Sensor
 saref:Sensor rdf:type owl:Class ;
-             rdfs:subClassOf saref:FunctionRelated ,
+             rdfs:subClassOf saref:Device ,
                              [ rdf:type owl:Restriction ;
                                owl:onProperty saref:hasFunction ;
                                owl:someValuesFrom saref:SensingFunction
@@ -1210,13 +1158,6 @@ saref:StopState rdf:type owl:Class ;
                 rdfs:label "Stop state"@en .
 
 
-###  https://saref.etsi.org/saref#Storage
-saref:Storage rdf:type owl:Class ;
-              rdfs:subClassOf saref:EnergyRelated ;
-              rdfs:comment "A type of energy-related device that stores energy"@en ;
-              rdfs:label "Storage"@en .
-
-
 ###  https://saref.etsi.org/saref#Switch
 saref:Switch rdf:type owl:Class ;
              rdfs:subClassOf saref:Actuator ;