Skip to content
Snippets Groups Projects
Commit 34260ab7 authored by Mauro Dragoni's avatar Mauro Dragoni
Browse files

Merge branch 'master' into 'develop' 

# Conflicts:
#   ontology/saref4wear.ttl
parents 41770cb8 824bfe8a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 16 additions and 21 deletions
ontology/saref4wear.ttl
+ 16
− 21
View file @ 34260ab7
...@@ -272,8 +272,8 @@ s4wear:isLocatedOn rdf:type owl:ObjectProperty ; ...@@ -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 .
...@@ -299,7 +299,7 @@ s4wear:sendsInformationTo rdf:type owl:ObjectProperty ; ...@@ -299,7 +299,7 @@ s4wear:sendsInformationTo rdf:type owl:ObjectProperty ;
### https://saref.etsi.org/saref4wear/sendsNotificationsTo ### https://saref.etsi.org/saref4wear/sendsNotificationsTo
s4wear:sendsNotificationsTo rdf:type owl:ObjectProperty ; s4wear:sendsNotificationsTo rdf:type owl:ObjectProperty ;
rdfs:subPropertyOf s4syst:connectedTo ; rdfs:subPropertyOf s4syst:connectedTo ;
rdfs:domain saref:Device ; rdfs:domain s4wear:Wearable ;
rdfs:range s4wear:Wearer . rdfs:range s4wear:Wearer .
...@@ -351,8 +351,7 @@ s4wear:hasBatteryLife rdf:type owl:DatatypeProperty ; ...@@ -351,8 +351,7 @@ s4wear:hasBatteryLife rdf:type owl:DatatypeProperty ;
### https://saref.etsi.org/saref4wear/hasCapacity ### https://saref.etsi.org/saref4wear/hasCapacity
s4wear:hasCapacity rdf:type owl:DatatypeProperty ; s4wear:hasCapacity rdf:type owl:DatatypeProperty ;
rdfs:domain s4city:Facility , rdfs:domain s4city:Facility ;
s4wear:Area ;
rdfs:range xsd:long . rdfs:range xsd:long .
...@@ -368,10 +367,10 @@ s4wear:hasDataTransmissionRate rdf:type owl:DatatypeProperty ; ...@@ -368,10 +367,10 @@ s4wear:hasDataTransmissionRate rdf:type owl:DatatypeProperty ;
rdfs:range xsd:double . rdfs:range xsd:double .
### https://saref.etsi.org/saref4wear/hasDeep ### https://saref.etsi.org/saref4wear/hasWidth
s4wear:hasDeep rdf:type owl:DatatypeProperty ; s4wear:hasWidth rdf:type owl:DatatypeProperty ;
rdfs:domain s4wear:Wearable ; rdfs:domain s4wear:Wearable ;
rdfs:range xsd:double . rdfs:range xsd:double .
### https://saref.etsi.org/saref4wear/hasHeight ### https://saref.etsi.org/saref4wear/hasHeight
...@@ -410,10 +409,10 @@ s4wear:meansOfTransport rdf:type owl:DatatypeProperty ; ...@@ -410,10 +409,10 @@ s4wear:meansOfTransport rdf:type owl:DatatypeProperty ;
rdfs:range xsd:string . rdfs:range xsd:string .
### https://saref.etsi.org/saref4wear/wearerRangeAge ### https://saref.etsi.org/saref4wear/wearerAgeRange
s4wear:wearerRangeAge rdf:type owl:DatatypeProperty ; s4wear:wearerAgeRange rdf:type owl:DatatypeProperty ;
rdfs:domain s4wear:Wearer ; rdfs:domain s4wear:Wearer ;
rdfs:range xsd:int . rdfs:range xsd:string .
### https://saref.etsi.org/saref4wear/wearerStatus ### https://saref.etsi.org/saref4wear/wearerStatus
...@@ -611,10 +610,6 @@ s4city:Event rdf:type owl:Class ; ...@@ -611,10 +610,6 @@ s4city:Event rdf:type owl:Class ;
rdfs:subClassOf [ rdf:type owl:Restriction ; rdfs:subClassOf [ rdf:type owl:Restriction ;
owl:onProperty s4city:takesPlaceAtFacility ; owl:onProperty s4city:takesPlaceAtFacility ;
owl:allValuesFrom s4city:Facility owl:allValuesFrom s4city:Facility
] ,
[ rdf:type owl:Restriction ;
owl:onProperty s4wear:hasSensor ;
owl:allValuesFrom saref:Sensor
] ; ] ;
rdfs:isDefinedBy s4city: ; rdfs:isDefinedBy s4city: ;
rdfs:label "Event"@en . rdfs:label "Event"@en .
...@@ -796,8 +791,8 @@ s4wear:User rdf:type owl:Class ; ...@@ -796,8 +791,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 .
...@@ -808,7 +803,7 @@ s4wear:WearableComponent rdf:type owl:Class ; ...@@ -808,7 +803,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
...@@ -816,8 +811,8 @@ s4wear:Wearer rdf:type owl:Class ; ...@@ -816,8 +811,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 .
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment