Commit dcde0392 authored by Mauro Dragoni's avatar Mauro Dragoni
Browse files

Merge branch 'fix-1' into 'master'

Changed the Wearer to be a subclass of LivingOrganism

See merge request stf/stf-566/saref4wear!15
parents c0eaca4d 5b183664
Loading
Loading
Loading
Loading
+7 −7
Original line number Original line Diff line number Diff line
@@ -272,8 +272,8 @@ s4wear:isLocatedOn rdf:type owl:ObjectProperty ;
s4wear:isSensedBy rdf:type owl:ObjectProperty ;
s4wear:isSensedBy rdf:type owl:ObjectProperty ;
                  rdfs:domain s4wear:Wearer ;
                  rdfs:domain s4wear:Wearer ;
                  rdfs:range s4wear:Wearable ;
                  rdfs:range s4wear:Wearable ;
                  rdfs:comment """Defines the relatonship between a wearer and a wearable device.
                  rdfs:comment "Defines the relatonship between a wearer and a wearable device.
The definition of this object property satisfies the requirement WEAR-2.""" ;
The definition of this object property satisfies the requirement WEAR-2." ;
                  rdfs:label "is sensed by"@en .
                  rdfs:label "is sensed by"@en .




@@ -805,8 +805,8 @@ s4wear:User rdf:type owl:Class ;
###  https://saref.etsi.org/saref4wear/Wearable
###  https://saref.etsi.org/saref4wear/Wearable
s4wear:Wearable rdf:type owl:Class ;
s4wear:Wearable rdf:type owl:Class ;
                rdfs:subClassOf saref:Device ;
                rdfs:subClassOf saref:Device ;
                rdfs:comment """A wearable device is a device that is intended to be located near, on or in an organism.
                rdfs:comment "A wearable device is a device that is intended to be located near, on or in an organism.
The definition of this concept satisfies the requirement WEAR-1."""@en ;
The definition of this concept satisfies the requirement WEAR-1."@en ;
                rdfs:label "Wearable device"@en .
                rdfs:label "Wearable device"@en .




@@ -816,7 +816,7 @@ s4wear:WearableComponent rdf:type owl:Class .


###  https://saref.etsi.org/saref4wear/Wearer
###  https://saref.etsi.org/saref4wear/Wearer
s4wear:Wearer rdf:type owl:Class ;
s4wear:Wearer rdf:type owl:Class ;
              rdfs:subClassOf [ owl:intersectionOf ( saref:FeatureOfInterest
              rdfs:subClassOf [ owl:intersectionOf ( s4wear:LivingOrganism
                                                     [ rdf:type owl:Restriction ;
                                                     [ rdf:type owl:Restriction ;
                                                       owl:onProperty s4wear:isSensedBy ;
                                                       owl:onProperty s4wear:isSensedBy ;
                                                       owl:someValuesFrom s4wear:Wearable
                                                       owl:someValuesFrom s4wear:Wearable
@@ -824,8 +824,8 @@ s4wear:Wearer rdf:type owl:Class ;
                                                   ) ;
                                                   ) ;
                                rdf:type owl:Class
                                rdf:type owl:Class
                              ] ;
                              ] ;
              rdfs:comment """A wearer is any living organism that is sensed by a wearable.
              rdfs:comment "A wearer is any living organism that is sensed by a wearable.
The definition of this concept satisfies the requirement WEAR-2."""@en ;
The definition of this concept satisfies the requirement WEAR-2."@en ;
              rdfs:label "Wearer"@en .
              rdfs:label "Wearer"@en .