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

Merge branch 'issue-15' into 'master'

Closes issue #15

Closes #15 and #23

See merge request SAREF/saref-core!30
parents 56ac655b 56ddba1a
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -13,6 +13,10 @@
  rdf:type owl:Ontology ;
  owl:imports <https://w3id.org/saref> ;
.
saref-em:MicroRenewable rdf:type owl:Class ;
                     rdfs:subClassOf saref:FunctionRelated ;
                     rdfs:comment "A device that generates renewable energy from natural resources such as the sun, wind and water.  A saref:MicroRenewable is typically used to accomplish saref:EnergyEfficiency."@en ;
                     rdfs:label "Micro renewable"@en .
saref-em:Efficiency
  rdf:type saref:Task ;
  rdfs:label "Efficiency"^^xsd:string ;
+4 −0
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@
  rdf:type owl:Ontology ;
  owl:imports <https://w3id.org/saref> ;
.
saref-ls:LightingDevice rdf:type owl:Class ;
                     rdfs:subClassOf saref:FunctionRelated ;
                     rdfs:comment "A device used for illumination, irradiation, signaling, or projection. A saref:LightingDevice is typically used to accomplish saref:Comfort."@en ;
                     rdfs:label "Lighting device"@en .
saref-ls:BuildingSpace_OfficeHall
  rdf:type saref:BuildingSpace ;
  rdfs:label "Office Hall"^^xsd:string ;
+19 −0
Original line number Diff line number Diff line
@prefix geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> .
@prefix owl: <http://www.w3.org/2002/07/owl#> .
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@prefix saref: <https://w3id.org/saref#> .
@prefix saref-mm: <http://ontology.tno.nl/saref/multimedia#> .
@prefix time: <http://www.w3.org/2006/time#> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .

<http://ontology.tno.nl/saref/multimedia>
  rdf:type owl:Ontology ;
  owl:imports <https://w3id.org/saref> ;
.

saref-mm:Multimedia rdf:type owl:Class ;
                 rdfs:subClassOf saref:FunctionRelated ;
                 rdfs:comment "A device designed to display, store, record or play multimedia content such as audio, images, animation, video. A saref:Multimedia is typically used to accomplish saref:Entertainment."@en ;
                 rdfs:label "Multimedia"@en .
+21 −1
Original line number Diff line number Diff line
@@ -13,6 +13,26 @@
  rdf:type owl:Ontology ;
  owl:imports <https://w3id.org/saref> ;
.

saref-wm:WashingMachine rdf:type owl:Class ;
                     rdfs:subClassOf saref:Appliance ,
                                     saref:Load ,
                                     [ rdf:type owl:Restriction ;
                                       owl:onProperty saref:hasFunction ;
                                       owl:someValuesFrom saref:StartStopFunction
                                     ] ,
                                     [ rdf:type owl:Restriction ;
                                       owl:onProperty saref:hasProfile ;
                                       owl:someValuesFrom saref:Profile
                                     ] ,
                                     [ rdf:type owl:Restriction ;
                                       owl:onProperty saref:hasState ;
                                       owl:someValuesFrom saref:StartStopState
                                     ] ;
                     rdfs:comment "A device of category saref:Appliance and saref:Load that performs an actuating function of type saref:StartStopFunction, can be found in the state saref:StartStopState, and can have a saref:Profile that characterizes its energy consumption. A saref:WashingMachine is typically used to saref:accomplish saref:Washing. "@en ;
                     rdfs:label "Washing machine"@en .


saref-wm:BuildingSpace_LaundryRoom
  rdf:type saref:BuildingSpace ;
  rdfs:label "Laundry room"^^xsd:string ;
@@ -100,7 +120,7 @@ saref-wm:StopState
  rdfs:label "Stop state"^^xsd:string ;
.
saref-wm:WashingMachine_WM802
  rdf:type saref:WashingMachine ;
  rdf:type saref-wm:WashingMachine ;
  rdfs:label "Washing machine WM802"^^xsd:string ;
  saref:accomplishes saref:Washing ;
  saref:hasCategory saref:Appliance ;
+81 −62
Original line number Diff line number Diff line
@@ -35,12 +35,15 @@
saref:accomplishes rdf:type owl:ObjectProperty ;
                   owl:inverseOf saref:isAccomplishedBy ;
                   rdfs:comment "A relationship between a certain entity (e.g., a device) and the task it accomplishes"@en ;
                   rdfs:range saref:Task ;
                   rdfs:label "accomplishes"@en .


###  https://saref.etsi.org/saref#actsUpon
saref:actsUpon rdf:type owl:ObjectProperty ;
               rdfs:comment "A relationship between a command and a state"@en ;
               rdfs:domain saref:Command ;
               rdfs:range saref:State ;
               rdfs:label "acts upon"@en .


@@ -53,6 +56,8 @@ saref:consistsOf rdf:type owl:ObjectProperty ;
###  https://saref.etsi.org/saref#controlsProperty
saref:controlsProperty rdf:type owl:ObjectProperty ;
                       rdfs:comment "A relationship specifying the property that can be controlled by a certain device"@en ;
                       rdfs:domain saref:Device ;
                       rdfs:range saref:Property ;
                       rdfs:label "controls property"@en .


@@ -60,80 +65,111 @@ saref:controlsProperty rdf:type owl:ObjectProperty ;
saref:hasCommand rdf:type owl:ObjectProperty ;
                 owl:inverseOf saref:isCommandOf ;
                 rdfs:comment "A relationship between a function and a command"@en ;
                 rdfs:domain saref:Function ;
                 rdfs:range saref:Command ;
                 rdfs:label "has command"@en .


###  https://saref.etsi.org/saref#isMeasurementOf
saref:isMeasurementOf rdf:type owl:ObjectProperty ;
                      owl:inverseOf saref:hasMeasurement ;
                      rdfs:comment "A relationship between a measurement and the feature of interest whose quality was measured"@en ;
                      rdfs:label "isMeasurementOf"@en .


###  https://saref.etsi.org/saref#hasFunction
saref:hasFunction rdf:type owl:ObjectProperty ;
                  rdfs:comment "A relationship identifying the function of a device"@en ;
                  rdfs:domain saref:Device ;
                  rdfs:range saref:Function ;
                  rdfs:label "has function"@en .


###  https://saref.etsi.org/saref#hasMeasurement
saref:hasMeasurement rdf:type owl:ObjectProperty ;
                     rdfs:comment "A relationship between a feature of interest and a measurement about it"@en ;
                     rdfs:domain saref:FeatureOfInterest ;
                     rdfs:range saref:Measurement ;
                     rdfs:label "has measurement"@en .


###  https://saref.etsi.org/saref#hasMeterReading
saref:hasMeterReading rdf:type owl:ObjectProperty ;
                      rdfs:comment "A relationship between a metering function and the measurement of the reading"@en ;
                      rdfs:domain saref:MeteringFunction ;
                      rdfs:range saref:Measurement ;
                      rdfs:label "has meter reading"@en .


###  https://saref.etsi.org/saref#hasMeterReadingType
saref:hasMeterReadingType rdf:type owl:ObjectProperty ;
                          rdfs:comment "A relationship identifying the reading type of a measurement (e.g., Water, Gas, Pressure , Energy , Power, etc.)"@en ;
                          rdfs:comment "A relationship identifying the reading type of a metering function (e.g., Water, Gas, Pressure , Energy , Power, etc.)"@en ;
                          rdfs:domain saref:MeteringFunction ;
                          rdfs:range saref:Property ;
                          rdfs:label "has meter reading type"@en .


###  https://saref.etsi.org/saref#hasPrice
saref:hasPrice rdf:type owl:ObjectProperty ;
               rdfs:comment "A relationship indentifying the price associated to an entity"@en ;
               rdfs:range saref:Price ;
               rdfs:label "has price"@en .


###  https://saref.etsi.org/saref#hasProfile
saref:hasProfile rdf:type owl:ObjectProperty ;
                 rdfs:comment "A relationship associating a profile to a certain device"@en ;
                 rdfs:domain saref:Device ;
                 rdfs:range saref:Profile ;
                 rdfs:label "has profile"@en .


###  https://saref.etsi.org/saref#hasMeasurement
saref:hasMeasurement rdf:type owl:ObjectProperty ;
                     rdfs:comment "A relationship between a feature of interest and a measurement about it"@en ;
                     rdfs:domain saref:FeatureOfInterest ;
                     rdfs:range saref:Measurement ;
                     rdfs:label "has measurement"@en .


###  https://saref.etsi.org/saref#hasProperty
saref:hasProperty rdf:type owl:ObjectProperty ;
                  owl:inverseOf saref:isPropertyOf ;
                  rdfs:comment "A relationship between a feature of interest and a property of that feature"@en ;
                  rdfs:domain saref:FeatureOfInterest ;
                  rdfs:range saref:Property ;
                  rdfs:label "has property"@en .


###  https://saref.etsi.org/saref#hasSensingRange
saref:hasSensingRange rdf:type owl:ObjectProperty ;
                      rdfs:comment "A relationship between a sensing function and a measurement identifying the range of a sensor detection"@en ;
                      rdfs:domain saref:SensingFunction ;
                      rdfs:range saref:Measurement ;
                      rdfs:label "has sensing range"@en .


###  https://saref.etsi.org/saref#hasSensorType
saref:hasSensorType rdf:type owl:ObjectProperty ;
                    rdfs:comment "A relationship identifying the sensing type of a sensor detection (i.e., Temperature, Occupancy, Humidity, Motion , Smoke, Pressure, etc.) "@en ;
                    rdfs:domain saref:SensingFunction ;
                    rdfs:range saref:Property ; 
                    rdfs:label "has sensor type"@en .


###  https://saref.etsi.org/saref#hasState
saref:hasState rdf:type owl:ObjectProperty ;
               rdfs:comment "A relationship identifying the type of state of a device"@en ;
               rdfs:domain saref:Device ;
               rdfs:range saref:State ;
               rdfs:label "has state"@en .


###  https://saref.etsi.org/saref#hasThresholdMeasurement
saref:hasThresholdMeasurement rdf:type owl:ObjectProperty ;
                              rdfs:comment "A relationship associated with an event function to notify that a certain threshold measurement has been exceeded"@en ;
                              rdfs:domain saref:EventFunction ;
                              rdfs:range saref:Measurement ;
                              rdfs:label "has threshold measurement"@en .


###  https://saref.etsi.org/saref#hasTime
saref:hasTime rdf:type owl:ObjectProperty ;
              rdfs:comment "A relationship to associate time information to an entity"@en ;
              rdfs:range saref:Time ;
              rdfs:label "has time"@en .


@@ -151,49 +187,66 @@ saref:isAbout rdf:type owl:ObjectProperty ;

###  https://saref.etsi.org/saref#isAccomplishedBy
saref:isAccomplishedBy rdf:type owl:ObjectProperty ;
                       rdfs:comment "A relationship indentifying the task accomplished by a certain entity (e.g., a device)"@en ;
                       rdfs:comment "A relationship identifying an entity (e.g., a device) that can accomplish a task."@en ;
                       rdfs:domain saref:Task ;
                       rdfs:label "is accomplished by"@en .


###  https://saref.etsi.org/saref#isCommandOf
saref:isCommandOf rdf:type owl:ObjectProperty ;
                  rdfs:comment "A relationship between a command and a function."@en ;
                  rdfs:domain saref:Command ;
                  rdfs:range saref:Function ;
                  rdfs:label "is command of"@en .


###  https://saref.etsi.org/saref#isControlledByDevice
saref:isControlledByDevice rdf:type owl:ObjectProperty ;
                           rdfs:comment "A relationship specifying the devices that can control a certain property"@en ;
                           rdfs:domain saref:Property ;
                           rdfs:range saref:Device ;
                           rdfs:label "is controlled by device"@en .


###  https://saref.etsi.org/saref#hasMeasurement
saref:hasMeasurement rdf:type owl:ObjectProperty ;
                     rdfs:comment "A relationship between a feature of interest and a measurement about it"@en ;
                     rdfs:label "has measurement"@en .

###  https://saref.etsi.org/saref#isMeasuredByDevice
saref:isMeasuredByDevice rdf:type owl:ObjectProperty ;
                         rdfs:comment "A relationship specifying the devices that can measure a certain property"@en ;
                         rdfs:domain saref:Property ;
                         rdfs:range saref:Device ;
                         rdfs:label "is measured by device"@en .


###  https://saref.etsi.org/saref#isMeasuredIn
saref:isMeasuredIn rdf:type owl:ObjectProperty ;
                   rdfs:comment "A relationship identifying the unit of measure used for a certain entity."@en ;
                   rdfs:domain saref:Measurement ;
                   rdfs:range saref:UnitOfMeasure ;
                   rdfs:label "is measured in"@en .


###  https://saref.etsi.org/saref#isMeasurementOf
saref:isMeasurementOf rdf:type owl:ObjectProperty ;
                      owl:inverseOf saref:hasMeasurement ;
                      rdfs:comment "A relationship between a measurement and the feature of interest whose quality was measured"@en ;
                      rdfs:domain saref:Measurement ;
                      rdfs:range saref:FeatureOfInterest ;
                      rdfs:label "isMeasurementOf"@en .


###  https://saref.etsi.org/saref#isOfferedBy
saref:isOfferedBy rdf:type owl:ObjectProperty ;
                  owl:inverseOf saref:offers ;
                  rdfs:comment "A relationship between a service and a device that offers the service"@en ;
                  rdfs:domain saref:Service ;
                  rdfs:range saref:Device ;
                  rdfs:label "is offered by"@en .


###  https://saref.etsi.org/saref#isPropertyOf
saref:isPropertyOf rdf:type owl:ObjectProperty ;
                   rdfs:comment "A relationship between a property and the feature of interest it belongs to"@en ;
                   rdfs:domain saref:Property ;
                   rdfs:range saref:FeatureOfInterest ;
                   rdfs:label "is property of"@en .


@@ -207,29 +260,39 @@ saref:isUsedFor rdf:type owl:ObjectProperty ;
saref:makesMeasurement rdf:type owl:ObjectProperty ;
                       owl:inverseOf saref:measurementMadeBy ;
                       rdfs:comment "A relation between a device and the measurements it makes. Such measurement will link together the value of the measurement, its unit of measure and the property to which it relates."@en ;
                       rdfs:domain saref:Device ;
                       rdfs:range saref:Measurement ;
                       rdfs:label "makes measurement"@en .

###  https://saref.etsi.org/saref#measurementMadeBy
saref:measurementMadeBy rdf:type owl:ObjectProperty ;
                        rdfs:comment "A relation between a measurement and the device that made it."@en ;
                        rdfs:domain saref:Measurement ;
                        rdfs:range saref:Device ;
                        rdfs:label "measurement made by"@en .


###  https://saref.etsi.org/saref#measuresProperty
saref:measuresProperty rdf:type owl:ObjectProperty ;
                       rdfs:comment "A relationship specifying the property that can be measured by a certain device"@en ;
                       rdfs:domain saref:Device ;
                       rdfs:range saref:Property ;
                       rdfs:label "measures property"@en .


###  https://saref.etsi.org/saref#offers
saref:offers rdf:type owl:ObjectProperty ;
             rdfs:comment "A relationship between a device and a service"@en ;
             rdfs:domain saref:Device ;
             rdfs:range saref:Service ;
             rdfs:label "offers"@en .


###  https://saref.etsi.org/saref#relatesToMeasurement
saref:relatesToMeasurement rdf:type owl:ObjectProperty ;
                           rdfs:comment "A relationship between a property and the measurements it relates to"@en ;
                           rdfs:domain saref:Property ;
                           rdfs:range saref:Measurement ;
                           rdfs:label "relates to measurement"@en .


@@ -237,12 +300,16 @@ saref:relatesToMeasurement rdf:type owl:ObjectProperty ;
saref:relatesToProperty rdf:type owl:ObjectProperty ;
                        owl:inverseOf saref:relatesToMeasurement ;
                        rdfs:comment "A relationship between a measurement and the property it relates to"@en ;
                        rdfs:domain saref:Measurement ;
                        rdfs:range saref:Property ;
                        rdfs:label "relates to property"@en .


###  https://saref.etsi.org/saref#represents
saref:represents rdf:type owl:ObjectProperty ;
                 rdfs:comment "A relationship between a service and a function."@en ;
                 rdfs:domain saref:Service ;
                 rdfs:range saref:Function ;
                 rdfs:label "represents"@en .


@@ -660,13 +727,6 @@ saref:LightSwitch rdf:type owl:Class ;
                  rdfs:label "Light switch"@en .


###  https://saref.etsi.org/saref#LightingDevice
saref:LightingDevice rdf:type owl:Class ;
                     rdfs:subClassOf saref:FunctionRelated ;
                     rdfs:comment "A device used for illumination, irradiation, signaling, or projection. A saref:LightingDevice is typically used to accomplish saref:Comfort."@en ;
                     rdfs:label "Lighting device"@en .


###  https://saref.etsi.org/saref#Load
saref:Load rdf:type owl:Class ;
           rdfs:subClassOf saref:EnergyRelated ;
@@ -740,13 +800,6 @@ saref:MeteringFunction rdf:type owl:Class ;
                       rdfs:label "Metering function"@en .


###  https://saref.etsi.org/saref#MicroRenewable
saref:MicroRenewable rdf:type owl:Class ;
                     rdfs:subClassOf saref:FunctionRelated ;
                     rdfs:comment "A device that generates renewable energy from natural resources such as the sun, wind and water.  A saref:MicroRenewable is typically used to accomplish saref:EnergyEfficiency."@en ;
                     rdfs:label "Micro renewable"@en .


###  https://saref.etsi.org/saref#Motion
saref:Motion rdf:type owl:Class ;
             rdfs:subClassOf saref:Property ;
@@ -761,20 +814,6 @@ saref:MultiLevelState rdf:type owl:Class ;
                      rdfs:label "Multi level state"@en .


###  https://saref.etsi.org/saref#Multimedia
saref:Multimedia rdf:type owl:Class ;
                 rdfs:subClassOf saref:FunctionRelated ;
                 rdfs:comment "A device designed to display, store, record or play multimedia content such as audio, images, animation, video. A saref:Multimedia is typically used to accomplish saref:Entertainment."@en ;
                 rdfs:label "Multimedia"@en .


###  https://saref.etsi.org/saref#Network
saref:Network rdf:type owl:Class ;
              rdfs:subClassOf saref:FunctionRelated ;
              rdfs:comment "A device used to connect other devices in a network, such as hub, switch or router in a Local Area Network (LAN). "@en ;
              rdfs:label "Network"@en .


###  https://saref.etsi.org/saref#NotifyCommand
saref:NotifyCommand rdf:type owl:Class ;
                    rdfs:subClassOf saref:Command ,
@@ -1257,26 +1296,6 @@ saref:UnitOfMeasure rdf:type owl:Class ;
                    rdfs:label "Unit of measure"@en .


###  https://saref.etsi.org/saref#WashingMachine
saref:WashingMachine rdf:type owl:Class ;
                     rdfs:subClassOf saref:Appliance ,
                                     saref:Load ,
                                     [ rdf:type owl:Restriction ;
                                       owl:onProperty saref:hasFunction ;
                                       owl:someValuesFrom saref:StartStopFunction
                                     ] ,
                                     [ rdf:type owl:Restriction ;
                                       owl:onProperty saref:hasProfile ;
                                       owl:someValuesFrom saref:Profile
                                     ] ,
                                     [ rdf:type owl:Restriction ;
                                       owl:onProperty saref:hasState ;
                                       owl:someValuesFrom saref:StartStopState
                                     ] ;
                     rdfs:comment "A device of category saref:Appliance and saref:Load that performs an actuating function of type saref:StartStopFunction, can be found in the state saref:StartStopState, and can have a saref:Profile that characterizes its energy consumption. A saref:WashingMachine is typically used to saref:accomplish saref:Washing. "@en ;
                     rdfs:label "Washing machine"@en .


###  https://saref.etsi.org/saref#Water
saref:Water rdf:type owl:Class ;
            rdfs:subClassOf saref:Commodity ;