diff --git a/ontology/saref4ehaw.ttl b/ontology/saref4ehaw.ttl
index 6780f01ad15386b1646ab306d11baaddce522290..a2ab14925fae91b06e79c06fe2a77807a52e5270 100644
--- a/ontology/saref4ehaw.ttl
+++ b/ontology/saref4ehaw.ttl
@@ -42,6 +42,8 @@ For embedded semantic analytics purposes, SAREF4EHAW shall behas been designed u
rdfs:comment "Extension of SAREF for eHealth Ageing Well domain." ;
+ dcterms:title "SAREF4EHAW: an extension of SAREF for eHealth Ageing Well domain"@en ;
+
dcterms:title "SAREF4EHAW: an extension of SAREF for eHealth Ageing Well domain"@en ;
owl:versionInfo "v1.1.1" ;
@@ -252,6 +254,19 @@ s4ehaw:contains rdf:type owl:ObjectProperty ;
rdfs:range s4ehaw:HealthDevice .
+### https://saref.etsi.org/s4ehaw/followsUser
+
+s4ehaw:followsUser rdf:type owl:ObjectProperty ;
+
+ rdfs:label "follows user"@en ;
+
+ rdfs:comment "A helper may follow one or multiple users that can in particular be patients."@en ;
+
+ rdfs:range s4ehaw:Helper ;
+
+ rdfs:domain saref:User .
+
+
### https://saref.etsi.org/s4ehaw/hasActivity
@@ -379,17 +394,31 @@ s4ehaw:hasHub rdf:type owl:ObjectProperty ;
+### https://saref.etsi.org/s4ehaw/hasHabit
+
+s4ehaw:hasHabit rdf:type owl:ObjectProperty ;
+
+ rdfs:label "has habit"@en ;
+
+ rdfs:comment "The habits of a user and a patient (as sub-class of user it also inherits habit), e.g. smoking or overeating."@en ;
+
+ rdfs:domain s4ehaw:User ;
+
+ rdfs:range s4ehaw:Habit .
+
+
+
### https://saref.etsi.org/s4ehaw/hasImpairment
s4ehaw:hasImpairment rdf:type owl:ObjectProperty ;
rdfs:label "has impairment"@en ;
- rdfs:comment "The impairment type of a patient, e.g. deaf, hearing, handling, visual, mobility..."@en ;
+ rdfs:comment "The impairment type of a user and a patient (as sub-class of user it also inherits habit), e.g. deaf, hearing, handling, visual, mobility..."@en ;
- rdfs:range s4ehaw:Impairment ;
-
- rdfs:domain s4ehaw:Patient .
+ rdfs:domain s4ehaw:User ;
+
+ rdfs:range s4ehaw:Impairment .
@@ -476,6 +505,20 @@ s4ehaw:hasParticipant rdf:type owl:ObjectProperty ;
s4ehaw:HealthDevice ;
rdfs:domain s4ehaw:MeasurementCollectionSession .
+
+
+
+### https://saref.etsi.org/s4ehaw/hasPatient
+
+s4ehaw:hasPatient rdf:type owl:ObjectProperty ;
+
+ rdfs:label "has patient"@en ;
+
+ rdfs:comment "A caregiver may have one or multiple patients."@en ;
+
+ rdfs:domain s4ehaw:Caregiver ;
+
+ rdfs:range s4ehaw:Patient .
@@ -499,9 +542,9 @@ s4ehaw:hasPosture rdf:type owl:ObjectProperty ;
rdfs:label "has posture"@en ;
- rdfs:comment "The posture of a health actor, e.g. exercising, lying, running, sitting, walking..."@en ;
+ rdfs:comment "The posture of a user and a patient (as sub-class of user it also inherits habit), e.g. exercising, lying, running, sitting, walking..."@en ;
- rdfs:domain s4ehaw:HealthActor ;
+ rdfs:domain s4ehaw:User ;
rdfs:range s4ehaw:Posture .
@@ -666,7 +709,6 @@ s4envi:hasFrequencyMeasurement rdf:type owl:ObjectProperty ;
-
#################################################################
#
# Data properties
@@ -730,11 +772,11 @@ s4ehaw:availableFlash rdf:type owl:DatatypeProperty ;
rdfs:label "available flash"@en ;
- rdfs:comment "The available flash memory of a health device."@en ;
-
- rdfs:range xsd:double ;
+ rdfs:comment "The available flash memory of a health device. It is a dynamic attribute."@en ;
+
+ rdfs:domain s4ehaw:HealthDevice ;
- rdfs:domain s4ehaw:ComputingPower .
+ rdfs:range xsd:double .
@@ -744,11 +786,11 @@ s4ehaw:availableRam rdf:type owl:DatatypeProperty ;
rdfs:label "available ram"@en ;
- rdfs:comment "Indicates the available volatile memory space of a health device."@en ;
+ rdfs:comment "Indicates the available volatile memory space of a health device. It is a dynamic attribute."@en ;
- rdfs:range xsd:double ;
-
- rdfs:domain s4ehaw:ComputingPower .
+ rdfs:domain s4ehaw:HealthDevice ;
+
+ rdfs:range xsd:double .
@@ -1001,20 +1043,6 @@ s4ehaw:hasGeolocation rdf:type owl:DatatypeProperty ;
-### https://saref.etsi.org/s4ehaw/hasHabit
-
-s4ehaw:hasHabit rdf:type owl:DatatypeProperty ;
-
- rdfs:label "has habit"@en ;
-
- rdfs:comment "The habits of a health actor, e.g. smoking."@en ;
-
- rdfs:range xsd:string ;
-
- rdfs:domain s4ehaw:HealthActor .
-
-
-
### https://saref.etsi.org/s4ehaw/hasInput
s4ehaw:hasInput rdf:type owl:DatatypeProperty ;
@@ -1395,11 +1423,11 @@ s4ehaw:remainingBatteryLevel rdf:type owl:DatatypeProperty ;
rdfs:label "remaining battery level"@en ;
- rdfs:comment "The level of remaining battery for a given power source of a health device."@en ;
+ rdfs:comment "The level of remaining battery (if any) for a health device. It is a dynamic attribute."@en ;
+
+ rdfs:domain s4ehaw:HealthDevice ;
- rdfs:range xsd:double ;
-
- rdfs:domain s4ehaw:PowerSource .
+ rdfs:range xsd:double .
@@ -1709,6 +1737,16 @@ s4ehaw:FunctionalDevice rdf:type owl:Class ;
+### https://saref.etsi.org/s4ehaw/Habit
+
+s4ehaw:Habit rdf:type owl:Class ;
+
+ rdfs:label "Habit" ;
+
+ rdfs:comment "Defined for users (that can in particular be patients) habits modelling, e.g. smoking, alcohol drinking, overeating, undereating..."@en .
+
+
+
### https://saref.etsi.org/s4ehaw/HealthActor
s4ehaw:HealthActor rdf:type owl:Class ;
@@ -1789,7 +1827,7 @@ s4ehaw:Impairment rdf:type owl:Class ;
rdfs:label "Impairment" ;
- rdfs:comment "Defined for patient's impairments modelling, e.g. deaf impairment, hearing impairement, handling impairment, visual impairement, blindI impairement, mobility impairement..."@en .
+ rdfs:comment "Defined for users (that can in particular be patients) impairments modelling, e.g. deaf impairment, hearing impairement, handling impairment, visual impairement, blindI impairement, mobility impairement..."@en .
@@ -1913,7 +1951,9 @@ s4ehaw:Patient rdf:type owl:Class ;
rdfs:label "Patient"@en ;
- rdfs:subClassOf s4ehaw:HealthActor .
+ rdfs:subClassOf s4ehaw:User ;
+
+ rdfs:comment "A user of the type patient, i.e. a cared-for person by one or multiple caregivers."@en .
@@ -1957,7 +1997,7 @@ s4ehaw:PowerSource rdf:type owl:Class ;
rdfs:label "Power source"@en ;
- rdfs:comment "The power sources of a health device, mainly describing energy source and battery related capabilities of the health device (number of power source, source type, rechargeable or not, available power level...)."@en .
+ rdfs:comment "The power sources of a health device, mainly describing energy source and battery related capabilities of the health device (number of power source, source type, rechargeable or not...)."@en .
@@ -2039,11 +2079,11 @@ s4ehaw:TimeSeriesMeasurements rdf:type owl:Class ;
s4ehaw:User rdf:type owl:Class ;
- rdfs:label "Service profile"@en ;
+ rdfs:label "User"@en ;
rdfs:subClassOf s4ehaw:HealthActor ;
- rdfs:comment "A health actor that is not a patient and is using BANs or health devices."@en .
+ rdfs:comment "A health actor (patient included) that can be equiped with BANs or health devices for monitoring, control, care (specific case of patients) or support purposes."@en .
@@ -2165,187 +2205,10 @@ s4envi:FrequencyUnit rdf:type owl:Class .
-### https://saref.etsi.org/s4ehaw/
-
-<https://saref.etsi.org/s4ehaw/> rdf:type voaf:Vocabulary ,
- owl:NamedIndividual .
-
-
-
-### https://saref.etsi.org/s4ehaw/Caregiver_Id_ABCD0001
-
-s4ehaw:Caregiver_Id_ABCD0001 rdf:type owl:NamedIndividual ,
- s4ehaw:Caregiver ;
-
- s4ehaw:hasPhysicalLocation s4ehawInst:Location_X1_Y2 ;
-
- s4ehaw:hasActivity s4ehawInst:RecordingECGSession_01 .
-
-
-
-### https://saref.etsi.org/s4ehaw/instances/AcceleroemeterX_ECGDevice
-
-s4ehawInst:AcceleroemeterX_ECGDevice rdf:type owl:NamedIndividual ,
- saref:Sensor .
-
-
-
-### https://saref.etsi.org/s4ehaw/instances/AcceleroemeterY_ECGDevice
-
-s4ehawInst:AcceleroemeterY_ECGDevice rdf:type owl:NamedIndividual ,
- saref:Sensor .
-
-
-
-### https://saref.etsi.org/s4ehaw/instances/AcceleroemeterZ_ECGDevice
-
-s4ehawInst:AcceleroemeterZ_ECGDevice rdf:type owl:NamedIndividual ,
- saref:Sensor .
-
-
+### https://saref.etsi.org/s4ehaw/instances/alcoholDrinking
-### https://saref.etsi.org/s4ehaw/instances/Driver_Id_XPTO0001
-
-s4ehawInst:Driver_Id_XPTO0001 rdf:type owl:NamedIndividual ,
- s4ehaw:HealthActor ;
-
- s4ehaw:hasActivity s4ehawInst:RecordingECGSession_01 .
-
-
-
-### https://saref.etsi.org/s4ehaw/instances/ECGLead_III_code131389
-
-s4ehawInst:ECGLead_III_code131389 rdf:type owl:NamedIndividual ,
- saref:Sensor .
-
-
-
-### https://saref.etsi.org/s4ehaw/instances/ECGLead_II_code131330
-
-s4ehawInst:ECGLead_II_code131330 rdf:type owl:NamedIndividual ,
- saref:Sensor .
-
-
-
-### https://saref.etsi.org/s4ehaw/instances/ECGLead_I_code131329
-
-s4ehawInst:ECGLead_I_code131329 rdf:type owl:NamedIndividual ,
- saref:Sensor ;
-
- saref:makesMeasurement s4ehawInst:ECGMeasurementsSeries_Example001 .
-
-
-
-### https://saref.etsi.org/s4ehaw/instances/ECGLead_Vx_RL_code131389
-
-s4ehawInst:ECGLead_Vx_RL_code131389 rdf:type owl:NamedIndividual ,
- saref:Sensor .
-
-
-
-### https://saref.etsi.org/s4ehaw/instances/ECGMeasurementsSeries_Example001
-
-s4ehawInst:ECGMeasurementsSeries_Example001 rdf:type owl:NamedIndividual ,
- s4ehaw:TimeSeriesMeasurements ;
-
- saref:hasTimestamp "2018-04-22T22:15:30"^^xsd:dateTime ;
-
- s4ehaw:hasValues "2037" ,
- "2062" ,
- "2043" ,
- "2060" ,
- "2041" ,
- "2047" ;
-
- saref:isMeasuredIn s4ehawInst:ElectricPotential_MilliVolts ;
-
- s4envi:hasFrequencyMeasurement s4ehawInst:FrequencyOf256Hertz ;
-
- saref:relatesToProperty s4ehawInst:HeartElectricalActivity_Person .
-
-
-
-### https://saref.etsi.org/s4ehaw/instances/ECGdeviceFrequency
-
-s4ehawInst:ECGdeviceFrequency rdf:type owl:NamedIndividual ,
- s4envi:Frequency .
-
-
-
-### https://saref.etsi.org/s4ehaw/instances/ElectricPotential_MilliVolts
-
-s4ehawInst:ElectricPotential_MilliVolts rdf:type owl:NamedIndividual ,
- saref:UnitOfMeasure ;
-
- rdfs:label "MilliVolts (mV)" .
-
-
-
-### https://saref.etsi.org/s4ehaw/instances/FrequencyOf256Hertz
-
-s4ehawInst:FrequencyOf256Hertz rdf:type owl:NamedIndividual ,
- s4envi:FrequencyMeasurement ;
-
- rdfs:label "256Hz frequency" ;
-
- saref:hasValue "256"^^xsd:int ;
-
- saref:isMeasuredIn <http://www.wurvoc.org/vocabularies/om-1.8/hertz> ;
-
- saref:relatesToProperty s4ehawInst:ECGdeviceFrequency .
-
-
-
-### https://saref.etsi.org/s4ehaw/instances/HeartElectricalActivity_Person
-
-s4ehawInst:HeartElectricalActivity_Person rdf:type owl:NamedIndividual ,
- saref:Property .
-
-
-
-### https://saref.etsi.org/s4ehaw/instances/Location_X1_Y2
-
-s4ehawInst:Location_X1_Y2 rdf:type owl:NamedIndividual ,
- s4ehaw:PhysicalLocation .
-
-
-
-### https://saref.etsi.org/s4ehaw/instances/RecordingECGSession_01
-
-s4ehawInst:RecordingECGSession_01 rdf:type owl:NamedIndividual ,
- s4ehaw:MeasurementCollectionSession ;
-
- rdfs:label "Recording ECG session 0001" ;
-
- rdfs:comment "An ECG recording session taken during a trip (truck driver)." ;
-
- saref:consistsOf s4ehawInst:ECGMeasurementsSeries_Example001 .
-
-
-
-### https://saref.etsi.org/s4ehaw/instances/Shimmer3ECG_unit_T9JRN42
-
-s4ehawInst:Shimmer3ECG_unit_T9JRN42 rdf:type owl:NamedIndividual ,
- s4ehaw:HealthDevice ,
- s4ehaw:HealthWearable ;
-
- rdfs:label "ECG Device: Shimmer3 ECG unit T9J-RN42" ;
-
- rdfs:comment "Shimmer3 EXG unit: device used for INTER-IoT-EWS project. " ;
-
- rdfs:seeAlso "http://www.shimmersensing.com/products/ecg-development-kit#specifications-tab" ;
-
- saref:consistsOf s4ehawInst:AcceleroemeterX_ECGDevice ,
- s4ehawInst:AcceleroemeterY_ECGDevice ,
- s4ehawInst:AcceleroemeterZ_ECGDevice ,
- s4ehawInst:ECGLead_III_code131389 ,
- s4ehawInst:ECGLead_II_code131330 ,
- s4ehawInst:ECGLead_I_code131329 ,
- s4ehawInst:ECGLead_Vx_RL_code131389 ;
-
- s4envi:hasFrequencyMeasurement s4ehawInst:FrequencyOf256Hertz ;
-
- saref:accomplishes s4ehawInst:RecordingECGSession_01 .
+s4ehawInst:alcoholDrinking rdf:type owl:NamedIndividual ,
+ s4ehaw:Habit .
@@ -2419,6 +2282,13 @@ s4ehawInst:mobilityImpairment rdf:type owl:NamedIndividual ,
+### https://saref.etsi.org/s4ehaw/instances/overeating
+
+s4ehawInst:overeating rdf:type owl:NamedIndividual ,
+ s4ehaw:Habit .
+
+
+
### https://saref.etsi.org/s4ehaw/instances/pervasiveComputing
s4ehawInst:pervasiveComputing rdf:type owl:NamedIndividual ,
@@ -2444,6 +2314,13 @@ s4ehawInst:safety rdf:type owl:NamedIndividual ,
s4ehawInst:sitting rdf:type owl:NamedIndividual ,
s4ehaw:Posture .
+
+
+
+### https://saref.etsi.org/s4ehaw/instances/smoking
+
+s4ehawInst:smoking rdf:type owl:NamedIndividual ,
+ s4ehaw:Habit .
@@ -2461,6 +2338,13 @@ s4ehawInst:telemedicine rdf:type owl:NamedIndividual ,
+### https://saref.etsi.org/s4ehaw/instances/undereating
+
+s4ehawInst:undereating rdf:type owl:NamedIndividual ,
+ s4ehaw:Habit .
+
+
+
### https://saref.etsi.org/s4ehaw/instances/visualImpairment
s4ehawInst:visualImpairment rdf:type owl:NamedIndividual ,