From 2d8964b99543bf6be0d4d7bc5c7c9b92ed8d6692 Mon Sep 17 00:00:00 2001
From: Marc Girod-Genet <marc.girod_genet@telecom-sudparis.eu>
Date: Sat, 15 Feb 2020 13:03:59 +0100
Subject: [PATCH] Replace saref4ehaw.ttl

---
 ontology/saref4ehaw.ttl | 93 ++++++++++++++++++++---------------------
 1 file changed, 46 insertions(+), 47 deletions(-)

diff --git a/ontology/saref4ehaw.ttl b/ontology/saref4ehaw.ttl
index 42d1445..eca66ed 100644
--- a/ontology/saref4ehaw.ttl
+++ b/ontology/saref4ehaw.ttl
@@ -89,15 +89,6 @@ vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
 #    Object Properties
 #################################################################
 
-###  https://saref.etsi.org/s4ehaw/IsUsedFor
-s4ehaw:IsUsedFor rdf:type owl:ObjectProperty ;
-                 rdfs:domain s4ehaw:FunctionalDevice ,
-                             s4ehaw:HealthDevice ;
-                 rdfs:range s4ehaw:Process ;
-                 rdfs:comment "Defines the relatonship between a health device is used for certain process (temperature measurement, blood pressure measurement, insulin regulation)" ,
-                              "Defines the relatonship between a non purely health device called functional device and that is used for certain process (luminosity measurement, air pressure measurement, heat level measurement)" ;
-                 rdfs:label "is used for"@en .
-
 ###  https://saref.etsi.org/s4ehaw/contains
 s4ehaw:contains rdf:type owl:ObjectProperty ;
                 rdfs:domain s4ehaw:Ban ;
@@ -119,8 +110,8 @@ s4ehaw:elects rdf:type owl:ObjectProperty ;
                rdfs:domain :Patient ,
                            :User ;
                rdfs:range :Activities ;
-               rdfs:comment "The relatonship between a patient that has activities" ,
-                            "The relatonship between a user that has activities" ;
+               rdfs:comment "The relationship between a patient that has activities" ,
+                            "The relationship between a user that has activities" ;
                rdfs:label "has activities"@en .
 
 
@@ -144,7 +135,7 @@ s4ehaw:hasCommunicationProcess rdf:type owl:ObjectProperty ;
 s4ehaw:hasConstraints rdf:type owl:ObjectProperty ;
                       rdfs:domain s4ehaw:Data ;
                       rdfs:range s4ehaw:Constraints ;
-                      rdfs:comment "Defines the relatonship between a data that has constraints (validity, operating, security...)" ;
+                      rdfs:comment "Defines the relationship between a data that has constraints (validity, operating, security...)" ;
                       rdfs:label "has constraints"@en .
 
 
@@ -160,7 +151,7 @@ s4ehaw:hasContact rdf:type owl:ObjectProperty ;
 s4ehaw:hasData rdf:type owl:ObjectProperty ;
                rdfs:domain s4ehaw:Process ;
                rdfs:range s4ehaw:Data ;
-               rdfs:comment "Defines the relatonship between a process that has has one or many data, for example a tracking process shall include latitude, longitude and speed data" ;
+               rdfs:comment "Defines the relatonship between a process that has one or many data, for example a tracking process shall include latitude, longitude and speed data" ;
                rdfs:label "has data"@en .
 
 
@@ -178,7 +169,7 @@ s4ehaw:hasDeviceType rdf:type owl:ObjectProperty ;
 :hasEnergy rdf:type owl:ObjectProperty ;
                        rdfs:domain s4ehaw:DeviceType ;
                        rdfs:range s4ehaw:Energy ;
-                       rdfs:comment "Defines the relatonship between a device type that has energy mainly describing energy source and battery related capabilities of the device (number, type, available level...)" ;
+                       rdfs:comment "Defines the relatonship between a device type that has energy mainly describing energy source and battery related capabilities of the device (number of energy source, source type, rechargeable or not, available energy level...)." ;
                        rdfs:label "has energy"@en .
 
 
@@ -197,7 +188,7 @@ s4ehaw:hasInterfaceType rdf:type owl:ObjectProperty ;
                         rdfs:domain s4ehaw:DeviceType ,
                                     s4ehaw:Interface ;
                         rdfs:range s4ehaw:InterfaceType ;
-                        rdfs:comment "Defines the relatonship between a device interface that has an interface type that describes the standard characteristics of the interface protocol/functional layerof the device and that is added for redundancy avoidance" ,
+                        rdfs:comment "Defines the relatonship between a device interface that has an interface type that describes the standard characteristics of the interface protocol/functional layer of the device and that is added for redundancy avoidance" ,
                                      "Defines the relatonship between a device type that has an given interface type that describes the standard characteristics of the interface protocol/functional layer of the device and that is added for redundancy avoidance" ;
                         rdfs:label "has interface type"@en .
 
@@ -205,7 +196,7 @@ s4ehaw:hasInterfaceType rdf:type owl:ObjectProperty ;
 ###  https://saref.etsi.org/s4ehaw/hasMesurement
 s4ehaw:hasMesurement rdf:type owl:ObjectProperty ;
                      rdfs:domain s4ehaw:Data ;
-                     rdfs:range s4ehaw:Measurement ;
+                     rdfs:range saref:Measurement ;
                      rdfs:comment "Defines the relatonship between data that has measurement" ;
                      rdfs:label "has measurement"@en .
 
@@ -240,7 +231,7 @@ s4ehaw:hasPhysicalLocation rdf:type owl:ObjectProperty ;
 :hasPower rdf:type owl:ObjectProperty ;
                     rdfs:domain s4ehaw:DeviceType ;
                     rdfs:range s4ehaw:Power ;
-                    rdfs:comment "Defines the relatonship between a device type that has power describing the processing power or capabilities of the device" ;
+                    rdfs:comment "Defines the relatonship between a device type that has power describing the processing power or capabilities of the device (number of energy source, source type, rechargeable or not, available energy level...)." ;
                     rdfs:label "has power"@en .
 
 
@@ -302,27 +293,22 @@ s4ehaw:isDescribedBy rdf:type owl:ObjectProperty ;
 
 ###  https://saref.etsi.org/s4ehaw/isMeasuredIn
 s4ehaw:isMeasuredIn rdf:type owl:ObjectProperty ;
-                    rdfs:domain s4ehaw:Measurement ,
+                    rdfs:domain saref:Measurement ,
                                 s4ehaw:TimeSeriesMeasurements ;
-                    rdfs:range s4ehaw:UnitOfMeasure ;
-                    rdfs:comment "Defines the relatonship between a measurement that is measured in a given unit of measure." ,
-                                 "Defines the relatonship between time series measurements that are measured in a given unit of measure." ;
+                    rdfs:range saref:UnitOfMeasure ;
+                    rdfs:comment "Defines the relationship between a measurement that is measured in a given unit of measure." ,
+                                 "Defines the relationship between time series measurements that are measured in a given unit of measure." ;
                     rdfs:label "is measured in"@en .
 
 
-###  https://saref.etsi.org/s4ehaw/location
-s4ehaw:location rdf:type owl:ObjectProperty ;
-                   rdfs:domain s4ehaw:HealthDevice ,
-		               s4ehaw:FunctionalDevice ;
-                   rdfs:range  s4ehaw:Location ,
-                                    [ rdf:type owl:Class ;
-                                      owl:unionOf ( s4ehaw:BodySurface
-                                                    s4ehaw:Implant
-                                                  )
-                                    ] ;
-                   rdfs:comment "The location of an health device, i.e. its position against the body - on or in the body - and/or its geolocation." ,
-		                "The location of a functional device, i.e. its position against the body - on or in the body - and/or its geolocation." ;
-                   rdfs:label "location"@en .
+###  https://saref.etsi.org/s4ehaw/isUsedFor
+s4ehaw:isUsedFor rdf:type owl:ObjectProperty ;
+                 rdfs:domain s4ehaw:FunctionalDevice ,
+                             s4ehaw:HealthDevice ;
+                 rdfs:range s4ehaw:Process ;
+                 rdfs:comment "Defines the relatonship between a health device is used for certain process (temperature measurement, blood pressure measurement, insulin regulation)" ,
+                              "Defines the relatonship between a non purely health device called functional device and that is used for certain process (luminosity measurement, air pressure measurement, heat level measurement)" ;
+                 rdfs:label "is used for"@en .
 
 
 ###  https://saref.etsi.org/saref#offers
@@ -335,13 +321,26 @@ saref:offers rdf:type owl:ObjectProperty ;
              rdfs:label "offers"@en .
 
 
-###  https://saref.etsi.org/s4ehaw/OperatingConstraints
-s4ehaw:OperatingConstraints rdf:type owl:ObjectProperty ;
+###  https://saref.etsi.org/s4ehaw/operatingConstraints
+s4ehaw:operatingConstraints rdf:type owl:ObjectProperty ;
                                rdfs:domain s4ehaw:DeviceType ;
                                rdfs:range s4ehaw:Operating ;
-			       rdfs:comment "The operating constraints of a device" ;
+			       rdfs:comment "The operating constraints of an health device" ;
                                rdfs:label "operating constraints"@en .
 
+			       
+###  https://saref.etsi.org/s4ehaw/position
+s4ehaw:position rdf:type owl:ObjectProperty ;
+                   rdfs:domain s4ehaw:HealthDevice ;
+                   rdfs:range  s4ehaw:Location ,
+                                    [ rdf:type owl:Class ;
+                                      owl:unionOf ( s4ehaw:BodySurface
+                                                    s4ehaw:Implant
+                                                  )
+                                    ] ;
+                   rdfs:comment "The position of an health device, i.e. its position against the body - on or in the body - and/or its geolocation - when available -." ;
+                   rdfs:label "position"@en .
+
 
 ###  https://saref.etsi.org/s4ehaw/presents
 s4ehaw:presents rdf:type owl:ObjectProperty ;
@@ -361,9 +360,9 @@ s4ehaw:supports rdf:type owl:ObjectProperty ;
 
 ###  https://saref.etsi.org/s4ehaw/uom
 s4ehaw:uom rdf:type owl:ObjectProperty ;
-           rdfs:domain s4ehaw:Process ;
-           rdfs:range s4ehaw:UnitOfMeasure ;
-           rdfs:comment "the unit of measurement of a process"@en ;
+           rdfs:domain s4ehaw:MeasurementProcess ;
+           rdfs:range saref:UnitOfMeasure ;
+           rdfs:comment "Defines the unit of measurement of a measurement process"@en ;
            rdfs:label "unit of measurement"@en .
 
 
@@ -744,7 +743,7 @@ s4ehaw:hasPrecondition rdf:type owl:DatatypeProperty ;
 
 ###  https://saref.etsi.org/s4ehaw/hasResult
 s4ehaw:hasResult rdf:type owl:DatatypeProperty ;
-                 rdfs:domain s4ehaw:Patient ;
+                 rdfs:domain s4ehaw:ServiceProcess ;
                  rdfs:range xsd:string ;
                  rdfs:comment "The process can have many reults for the same output, these resuts may include a message that should be displayed, an alert, etc." ;
                  rdfs:label "has result"@en .
@@ -1136,8 +1135,8 @@ s4ehaw:Legal rdf:type owl:Class ;
 s4ehaw:Location rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/s4ehaw/Measurement
-s4ehaw:Measurement rdf:type owl:Class .
+###  https://saref.etsi.org/saref#Measurement
+saref:Measurement rdf:type owl:Class .
 
 
 ###  https://saref.etsi.org/s4ehaw/MeasurementProcess
@@ -1234,10 +1233,6 @@ s4ehaw:Simple rdf:type owl:Class ;
 s4ehaw:TimeSeriesMeasurements rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/s4ehaw/UnitOfMeasure
-s4ehaw:UnitOfMeasure rdf:type owl:Class .
-
-
 ###  https://saref.etsi.org/s4ehaw/User
 s4ehaw:User rdf:type owl:Class  ;
             rdfs:subClassOf s4ehaw:Actor .
@@ -1260,6 +1255,10 @@ saref:Device rdf:type owl:Class .
 saref:Service rdf:type owl:Class .
 
 
+###  https://saref.etsi.org/saref#UnitofMeasure
+saref:UnitOfMeasure rdf:type owl:Class .
+
+
 ###  https://saref.etsi.org/s4wear#Wearable
 s4wear:Wearable rdf:type owl:Class ;
                 rdfs:subClassOf s4ehaw:HealthDevice .
-- 
GitLab