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

Merge branch 'issue-11' into 'master'

Close Issue #11

Closes #11

See merge request SAREF/saref-core!13
parents 259cf168 ba607629
Loading
Loading
Loading
Loading
+4 −24
Original line number Diff line number Diff line
@@ -426,10 +426,6 @@ saref:Device rdf:type owl:Class ;
###  https://saref.etsi.org/DoorSwitch
saref:DoorSwitch rdf:type owl:Class ;
                 rdfs:subClassOf saref:Switch ,
                                 [ rdf:type owl:Restriction ;
                                   owl:onProperty saref:consistsOf ;
                                   owl:someValuesFrom saref:Switch
                                 ] ,
                                 [ rdf:type owl:Restriction ;
                                   owl:onProperty saref:hasFunction ;
                                   owl:someValuesFrom saref:OpenCloseFunction
@@ -438,7 +434,7 @@ saref:DoorSwitch rdf:type owl:Class ;
                                   owl:onProperty saref:hasState ;
                                   owl:someValuesFrom saref:OpenCloseState
                                 ] ;
                 rdfs:comment "A device of category saref:Actuator that consists of a switch, performs the saref:OpenCloseFunction, is used for controlling a door, and can be found in the state saref:OpenCloseState. A saref:DoorSwitch is typically used to accomplish saref:Safety."^^xsd:string ;
                 rdfs:comment "A switch that performs the saref:OpenCloseFunction, is used for controlling a door, and can be found in the state saref:OpenCloseState. A saref:DoorSwitch is typically used to accomplish saref:Safety."^^xsd:string ;
                 rdfs:label "Door switch"^^xsd:string .


@@ -459,15 +455,11 @@ saref:Energy rdf:type owl:Class ;
###  https://saref.etsi.org/EnergyMeter
saref:EnergyMeter rdf:type owl:Class ;
                  rdfs:subClassOf saref:Meter ,
                                  [ rdf:type owl:Restriction ;
                                    owl:onProperty saref:consistsOf ;
                                    owl:someValuesFrom saref:Meter
                                  ] ,
                                  [ rdf:type owl:Restriction ;
                                    owl:onProperty saref:measuresProperty ;
                                    owl:someValuesFrom saref:Energy
                                  ] ;
                  rdfs:comment "An energy meter is a device of category saref:Meter that consists of a meter, 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."^^xsd:string ;
                  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."^^xsd:string ;
                  rdfs:label "Energy meter"^^xsd:string .


@@ -616,10 +608,6 @@ saref:Light rdf:type owl:Class ;
###  https://saref.etsi.org/LightSwitch
saref:LightSwitch rdf:type owl:Class ;
                  rdfs:subClassOf saref:Switch ,
                                  [ rdf:type owl:Restriction ;
                                    owl:onProperty saref:consistsOf ;
                                    owl:someValuesFrom saref:Switch
                                  ] ,
                                  [ rdf:type owl:Restriction ;
                                    owl:onProperty saref:hasFunction ;
                                    owl:someValuesFrom saref:OnOffFunction
@@ -1042,10 +1030,6 @@ saref:Smoke rdf:type owl:Class ;
###  https://saref.etsi.org/SmokeSensor
saref:SmokeSensor rdf:type owl:Class ;
                  rdfs:subClassOf saref:Sensor ,
                                  [ rdf:type owl:Restriction ;
                                    owl:onProperty saref:consistsOf ;
                                    owl:someValuesFrom saref:Sensor
                                  ] ,
                                  [ rdf:type owl:Restriction ;
                                    owl:onProperty saref:hasFunction ;
                                    owl:someValuesFrom saref:EventFunction
@@ -1058,7 +1042,7 @@ saref:SmokeSensor rdf:type owl:Class ;
                                    owl:onProperty saref:measuresProperty ;
                                    owl:someValuesFrom saref:Smoke
                                  ] ;
                  rdfs:comment "A device that consists of a sensor, has category saref:Sensor, performs the saref:SensingFunction and saref:EventFunction (which notifies that a certain threshold has been exceeded), and is used for the purpose of sensing a property of type saref:Smoke. A saref:SmokeSensor is typically used to saref:accomplish saref:Safety."^^xsd:string ;
                  rdfs:comment "A sensor that performs the saref:SensingFunction and saref:EventFunction (which notifies that a certain threshold has been exceeded), and is used for the purpose of sensing a property of type saref:Smoke. A saref:SmokeSensor is typically used to saref:accomplish saref:Safety."^^xsd:string ;
                  rdfs:label "Smoke sensor"^^xsd:string .


@@ -1195,10 +1179,6 @@ saref:Temperature rdf:type owl:Class ;
###  https://saref.etsi.org/TemperatureSensor
saref:TemperatureSensor rdf:type owl:Class ;
                        rdfs:subClassOf saref:Sensor ,
                                        [ rdf:type owl:Restriction ;
                                          owl:onProperty saref:consistsOf ;
                                          owl:someValuesFrom saref:Sensor
                                        ] ,
                                        [ rdf:type owl:Restriction ;
                                          owl:onProperty saref:hasFunction ;
                                          owl:someValuesFrom saref:SensingFunction
@@ -1207,7 +1187,7 @@ saref:TemperatureSensor rdf:type owl:Class ;
                                          owl:onProperty saref:measuresProperty ;
                                          owl:someValuesFrom saref:Temperature
                                        ] ;
                        rdfs:comment "A device that consists of a sensor, has category saref:Sensor, performs the saref:SensingFunction and is used for the purpose of sensing a property of type saref:Temperature. A saref:TemperatureSensor is typically used to saref:accomplish saref:Comfort."^^xsd:string ;
                        rdfs:comment "A sensor that is used for the purpose of sensing a property of type saref:Temperature. A saref:TemperatureSensor is typically used to saref:accomplish saref:Comfort."^^xsd:string ;
                        rdfs:label "Temperature sensor"^^xsd:string .