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

Merge branch 'issue-13' into 'master'

removed axioms subClassOf( <DEVICE> HasValue( accomplishes <TASK>) )

Closes #13

See merge request SAREF/saref-core!9
parents aabfd69c bb829aa9
Loading
Loading
Loading
Loading
+14 −58
Original line number Original line Diff line number Diff line
@@ -437,12 +437,8 @@ saref:DoorSwitch rdf:type owl:Class ;
                                 [ rdf:type owl:Restriction ;
                                 [ rdf:type owl:Restriction ;
                                   owl:onProperty saref:hasState ;
                                   owl:onProperty saref:hasState ;
                                   owl:someValuesFrom saref:OpenCloseState
                                   owl:someValuesFrom saref:OpenCloseState
                                 ] ,
                                 [ rdf:type owl:Restriction ;
                                   owl:onProperty saref:accomplishes ;
                                   owl:hasValue saref:Safety
                                 ] ;
                                 ] ;
                 rdfs:comment "A device of category saref:Actuator that consists of a switch, accomplishes the task saref:Safety, performs the saref:OpenCloseFunction, is used for controlling a door, and can be found in the state saref:OpenCloseState."^^xsd:string ;
                 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:label "Door switch"^^xsd:string .
                 rdfs:label "Door switch"^^xsd:string .




@@ -470,16 +466,8 @@ saref:EnergyMeter rdf:type owl:Class ;
                                  [ rdf:type owl:Restriction ;
                                  [ rdf:type owl:Restriction ;
                                    owl:onProperty saref:measuresProperty ;
                                    owl:onProperty saref:measuresProperty ;
                                    owl:someValuesFrom saref:Energy
                                    owl:someValuesFrom saref:Energy
                                  ] ,
                                  [ rdf:type owl:Restriction ;
                                    owl:onProperty saref:accomplishes ;
                                    owl:hasValue saref:EnergyEfficiency
                                  ] ,
                                  [ rdf:type owl:Restriction ;
                                    owl:onProperty saref:accomplishes ;
                                    owl:hasValue saref:MeterReading
                                  ] ;
                                  ] ;
                  rdfs:comment "An energy meter is a device of category saref:Meter that consists of a meter, accomplishes the tasks saref:MeterReading and saref:EnergyEfficiency, performs the saref:MeteringFunction and is used for the purpose of measuring the saref:Energy property"^^xsd:string ;
                  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:label "Energy meter"^^xsd:string .
                  rdfs:label "Energy meter"^^xsd:string .




@@ -582,12 +570,8 @@ saref:GetSensingDataCommand rdf:type owl:Class ;


###  https://saref.etsi.org/HVAC
###  https://saref.etsi.org/HVAC
saref:HVAC rdf:type owl:Class ;
saref:HVAC rdf:type owl:Class ;
           rdfs:subClassOf saref:FunctionRelated ,
           rdfs:subClassOf saref:FunctionRelated ;
                           [ rdf:type owl:Restriction ;
           rdfs:comment "Heating, Ventilation and Air Conditioning (HVAC) device that provides indoor environmental comfort. A saref:HVAC is typically used to accomplish saref:Comfort."^^xsd:string ;
                             owl:onProperty saref:accomplishes ;
                             owl:hasValue saref:Comfort
                           ] ;
           rdfs:comment "Heating, Ventilation and Air Conditioning (HVAC) device that provides indoor environmental comfort"^^xsd:string ;
           rdfs:label "HVAC"^^xsd:string .
           rdfs:label "HVAC"^^xsd:string .




@@ -651,23 +635,15 @@ saref:LightSwitch rdf:type owl:Class ;
                                  [ rdf:type owl:Restriction ;
                                  [ rdf:type owl:Restriction ;
                                    owl:onProperty saref:offers ;
                                    owl:onProperty saref:offers ;
                                    owl:someValuesFrom saref:SwitchOnService
                                    owl:someValuesFrom saref:SwitchOnService
                                  ] ,
                                  [ rdf:type owl:Restriction ;
                                    owl:onProperty saref:accomplishes ;
                                    owl:hasValue saref:Lighting
                                  ] ;
                                  ] ;
                  rdfs:comment "A device of category saref:Actuator that consists of a switch, accomplishes the task saref:Lighting, performs the saref:OnOffFunction, measures the property saref:Light, and can be found in the state saref:OnOffState. It can offer a switch on service."^^xsd:string ;
                  rdfs:comment "A device of category saref:Actuator that consists of a switch, performs the saref:OnOffFunction, measures the property saref:Light, and can be found in the state saref:OnOffState. It can offer a switch on service. A saref:LightSwitch is typically used to accomplish saref:Lighting."^^xsd:string ;
                  rdfs:label "Light switch"^^xsd:string .
                  rdfs:label "Light switch"^^xsd:string .




###  https://saref.etsi.org/LightingDevice
###  https://saref.etsi.org/LightingDevice
saref:LightingDevice rdf:type owl:Class ;
saref:LightingDevice rdf:type owl:Class ;
                     rdfs:subClassOf saref:FunctionRelated ,
                     rdfs:subClassOf saref:FunctionRelated ;
                                     [ rdf:type owl:Restriction ;
                     rdfs:comment "A device used for illumination, irradiation, signaling, or projection. A saref:LightingDevice is typically used to accomplish saref:Comfort."^^xsd:string ;
                                       owl:onProperty saref:accomplishes ;
                                       owl:hasValue saref:Comfort
                                     ] ;
                     rdfs:comment "A device used for illumination, irradiation, signaling, or projection"^^xsd:string ;
                     rdfs:label "Lighting device"^^xsd:string .
                     rdfs:label "Lighting device"^^xsd:string .




@@ -752,12 +728,8 @@ saref:MeteringFunction rdf:type owl:Class ;


###  https://saref.etsi.org/MicroRenewable
###  https://saref.etsi.org/MicroRenewable
saref:MicroRenewable rdf:type owl:Class ;
saref:MicroRenewable rdf:type owl:Class ;
                     rdfs:subClassOf saref:FunctionRelated ,
                     rdfs:subClassOf saref:FunctionRelated ;
                                     [ rdf:type owl:Restriction ;
                     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."^^xsd:string ;
                                       owl:onProperty saref:accomplishes ;
                                       owl:hasValue saref:EnergyEfficiency
                                     ] ;
                     rdfs:comment "A device that generates renewable energy from natural resources such as teh sun, wind and water"^^xsd:string ;
                     rdfs:label "Micro renewable"^^xsd:string .
                     rdfs:label "Micro renewable"^^xsd:string .




@@ -777,12 +749,8 @@ saref:MultiLevelState rdf:type owl:Class ;


###  https://saref.etsi.org/Multimedia
###  https://saref.etsi.org/Multimedia
saref:Multimedia rdf:type owl:Class ;
saref:Multimedia rdf:type owl:Class ;
                 rdfs:subClassOf saref:FunctionRelated ,
                 rdfs:subClassOf saref:FunctionRelated ;
                                 [ rdf:type owl:Restriction ;
                 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."^^xsd:string ;
                                   owl:onProperty saref:accomplishes ;
                                   owl:hasValue saref:Entertainment
                                 ] ;
                 rdfs:comment "A device designed to display, store, record or play multimedia content such as audio, images, animation, video "^^xsd:string ;
                 rdfs:label "Multimedia"^^xsd:string .
                 rdfs:label "Multimedia"^^xsd:string .




@@ -1089,12 +1057,8 @@ saref:SmokeSensor rdf:type owl:Class ;
                                  [ rdf:type owl:Restriction ;
                                  [ rdf:type owl:Restriction ;
                                    owl:onProperty saref:measuresProperty ;
                                    owl:onProperty saref:measuresProperty ;
                                    owl:someValuesFrom saref:Smoke
                                    owl:someValuesFrom saref:Smoke
                                  ] ,
                                  [ rdf:type owl:Restriction ;
                                    owl:onProperty saref:accomplishes ;
                                    owl:hasValue saref:Safety
                                  ] ;
                                  ] ;
                  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."^^xsd:string ;
                  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:label "Smoke sensor"^^xsd:string .
                  rdfs:label "Smoke sensor"^^xsd:string .




@@ -1247,12 +1211,8 @@ saref:TemperatureSensor rdf:type owl:Class ;
                                        [ rdf:type owl:Restriction ;
                                        [ rdf:type owl:Restriction ;
                                          owl:onProperty saref:measuresProperty ;
                                          owl:onProperty saref:measuresProperty ;
                                          owl:someValuesFrom saref:Temperature
                                          owl:someValuesFrom saref:Temperature
                                        ] ,
                                        [ rdf:type owl:Restriction ;
                                          owl:onProperty saref:accomplishes ;
                                          owl:hasValue saref:Comfort
                                        ] ;
                                        ] ;
                        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"^^xsd:string ;
                        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:label "Temperature sensor"^^xsd:string .
                        rdfs:label "Temperature sensor"^^xsd:string .




@@ -1303,12 +1263,8 @@ saref:WashingMachine rdf:type owl:Class ;
                                     [ rdf:type owl:Restriction ;
                                     [ rdf:type owl:Restriction ;
                                       owl:onProperty saref:hasState ;
                                       owl:onProperty saref:hasState ;
                                       owl:someValuesFrom saref:StartStopState
                                       owl:someValuesFrom saref:StartStopState
                                     ] ,
                                     [ rdf:type owl:Restriction ;
                                       owl:onProperty saref:accomplishes ;
                                       owl:hasValue saref:Washing
                                     ] ;
                                     ] ;
                     rdfs:comment "A device of category saref:Appliance and saref:Load that accomplishes the task saref:Washing, 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. "^^xsd:string ;
                     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. "^^xsd:string ;
                     rdfs:label "Washing machine"^^xsd:string .
                     rdfs:label "Washing machine"^^xsd:string .