From 20a3a5c1ce52b26d5907ad4bd56d716fba4e2b0e Mon Sep 17 00:00:00 2001
From: Marc Girod-Genet <marc.girod_genet@telecom-sudparis.eu>
Date: Sat, 2 May 2020 05:09:40 +0200
Subject: [PATCH] =?UTF-8?q?New=20version=20addressing=20issues=20#13=20to?=
 =?UTF-8?q?=20#81=20from=20Maxime=20Lefran=C3=A7ois.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ontology/saref4ehaw.ttl | 43 ++++++++++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/ontology/saref4ehaw.ttl b/ontology/saref4ehaw.ttl
index 204cdf4..eb1a0ed 100644
--- a/ontology/saref4ehaw.ttl
+++ b/ontology/saref4ehaw.ttl
@@ -240,6 +240,14 @@ s4ehaw:hasMode rdf:type owl:ObjectProperty ;
                rdfs:label "has mode"@en .
 
 
+##  https://saref.etsi.org/saref4ehaw/hasOperatingConstraint
+s4ehaw:hasOperatingConstraint rdf:type owl:ObjectProperty ;
+                              rdfs:domain s4ehaw:HealthDevice ;
+                              rdfs:range s4ehaw:OperatingConstraint ;
+                              rdfs:comment "The operating constraints of a health device, e.g. recommended humidity and temperature range..."@en ;
+                              rdfs:label "has operating constraint"@en .
+
+
 ###  https://saref.etsi.org/saref4ehaw/hasParticipant
 s4ehaw:hasParticipant rdf:type owl:ObjectProperty ;
                       rdfs:domain s4ehaw:MeasurementCollectionSession ;
@@ -407,16 +415,16 @@ s4ehaw:ageCategory rdf:type owl:DatatypeProperty ;
 ###  https://saref.etsi.org/saref4ehaw/availableFlash
 s4ehaw:availableFlash rdf:type owl:DatatypeProperty ;
                       rdfs:domain s4ehaw:HealthDevice ;
-                      rdfs:range xsd:double ;
-                      rdfs:comment "The available flash memory of a health device. It is a dynamic attribute."@en ;
+                      rdfs:range xsd:long ;
+                      rdfs:comment "The available flash memory (in byte) of a health device. It is a dynamic attribute."@en ;
                       rdfs:label "available flash"@en .
 
 
 ###  https://saref.etsi.org/saref4ehaw/availableRam
 s4ehaw:availableRam rdf:type owl:DatatypeProperty ;
                     rdfs:domain s4ehaw:HealthDevice ;
-                    rdfs:range xsd:double ;
-                    rdfs:comment "Indicates the available volatile memory space of a health device. It is a dynamic attribute."@en ;
+                    rdfs:range xsd:long ;
+                    rdfs:comment "Indicates the available volatile memory space (in byte) of a health device. It is a dynamic attribute."@en ;
                     rdfs:label "available ram"@en .
 
 
@@ -503,7 +511,7 @@ s4ehaw:format rdf:type owl:DatatypeProperty ;
 ###  https://saref.etsi.org/saref4ehaw/frequency
 s4ehaw:frequency rdf:type owl:DatatypeProperty ;
                  rdfs:domain s4ehaw:ComputingPower ;
-                 rdfs:range xsd:double ;
+                 rdfs:range xsd:long ;
                  rdfs:comment "The frequency is the number of instructions an embedded processor - within a health device - can perform per second."@en ;
                  rdfs:label "frequency"@en .
 
@@ -688,16 +696,16 @@ s4ehaw:manufacturer rdf:type owl:DatatypeProperty ;
 ###  https://saref.etsi.org/saref4ehaw/maximumFlash
 s4ehaw:maximumFlash rdf:type owl:DatatypeProperty ;
                     rdfs:domain s4ehaw:ComputingPower ;
-                    rdfs:range xsd:double ;
-                    rdfs:comment "Indicates the maximum flash memory space (in Go) of a health device."@en ;
+                    rdfs:range xsd:long ;
+                    rdfs:comment "Indicates the maximum flash memory space (in byte) of a health device."@en ;
                     rdfs:label "maximum flash"@en .
 
 
 ###  https://saref.etsi.org/saref4ehaw/maximumRam
 s4ehaw:maximumRam rdf:type owl:DatatypeProperty ;
                   rdfs:domain s4ehaw:ComputingPower ;
-                  rdfs:range xsd:double ;
-                  rdfs:comment "Indicates the maximum volatile memory space (in Go) of a health device."@en ;
+                  rdfs:range xsd:long ;
+                  rdfs:comment "Indicates the maximum volatile memory space (in byte) of a health device."@en ;
                   rdfs:label "maximum ram"@en .
 
 
@@ -784,7 +792,7 @@ s4ehaw:rechargeable rdf:type owl:DatatypeProperty ;
 ###  https://saref.etsi.org/saref4ehaw/remainingBatteryLevel
 s4ehaw:remainingBatteryLevel rdf:type owl:DatatypeProperty ;
                              rdfs:domain s4ehaw:HealthDevice ;
-                             rdfs:range xsd:double ;
+                             rdfs:range xsd:long ;
                              rdfs:comment "The level of remaining battery (if any : in percent) for a health device. It is a dynamic attribute."@en ;
                              rdfs:label "remaining battery level"@en .
 
@@ -829,8 +837,8 @@ s4ehaw:serviceName rdf:type owl:DatatypeProperty ;
                    rdfs:label "service name"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/topology
-s4ehaw:topology rdf:type owl:DatatypeProperty ;
+###  https://saref.etsi.org/saref4ehaw/banTopology
+s4ehaw:banTopology rdf:type owl:DatatypeProperty ;
                 rdfs:domain s4ehaw:Ban ;
                 rdfs:range [ rdf:type rdfs:Datatype ;
                              owl:oneOf [ rdf:type rdf:List ;
@@ -845,14 +853,14 @@ s4ehaw:topology rdf:type owl:DatatypeProperty ;
                                        ]
                            ] ;
                 rdfs:comment "The BAN physical topology type, i.e Adhoc or Star or Mesh or Others."@ne ;
-                rdfs:label "topology"@en .
+                rdfs:label "BAN topology"@en .
 
 
 ###  https://saref.etsi.org/saref4ehaw/velocity
 s4ehaw:velocity rdf:type owl:DatatypeProperty ;
                 rdfs:domain s4ehaw:DeviceType ;
                 rdfs:range xsd:float ;
-                rdfs:comment "The velocity of a moving device."@en ;
+                rdfs:comment "The velocity of a moving device (in m/s)."@en ;
                 rdfs:label "velocity"@en .
 
 
@@ -967,9 +975,9 @@ s4ehaw:DeviceType rdf:type owl:Class ;
 
 ###  https://saref.etsi.org/saref4ehaw/EventDrivenBanCommunicationFunction
 s4ehaw:EventDrivenBanCommunicationFunction rdf:type owl:Class ;
-                                        rdfs:subClassOf s4ehaw:BanCommunicationFunction ;
-                                        rdfs:comment "BAN communication function way of working of the type event driven."@en ;
-                                        rdfs:label "Event driven BAN communication function"@en .
+                                           rdfs:subClassOf s4ehaw:BanCommunicationFunction ;
+                                           rdfs:comment "BAN communication function way of working of the type event driven."@en ;
+                                           rdfs:label "Event driven BAN communication function"@en .
 
 
 ###  https://saref.etsi.org/saref4ehaw/FunctionalDevice
@@ -1095,7 +1103,6 @@ s4ehaw:OnRequestBanCommunicationFunction rdf:type owl:Class ;
 
 ###  https://saref.etsi.org/saref4ehaw/OperatingConstraint
 s4ehaw:OperatingConstraint rdf:type owl:Class ;
-                           rdfs:subClassOf s4ehaw:Constraint ;
                            rdfs:comment "An empty container for describing the operating constraints of a device, e.g. recommended humidity and temperature range..."@en ;
                            rdfs:label "Operating constraint"@en .
 
-- 
GitLab