Commit 13e7bc65 authored by Mauro Dragoni's avatar Mauro Dragoni
Browse files

Merge branch 'develop' into 'master' 

Renamed s4wear:ControlFunction and s4wear:ActionFunction. Issue #20.

Closes #20

See merge request stf/stf-566/saref4wear!32
parents fe75a8cf 40d20758

.gitignore

+5 −0
Original line number Diff line number Diff line
@@ -2,3 +2,8 @@ 
.project

.classpath

.settings

*~

saref-pipeline.jar

.DS_Store

target

catalog-v001.xml

LICENSE

+0 −1
Original line number Diff line number Diff line
@@ -21,4 +21,3 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 

OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 

OF THE POSSIBILITY OF SUCH DAMAGE.

ontology/saref4wear.ttl

+48 −50
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
@prefix geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> .

@prefix owl: <http://www.w3.org/2002/07/owl#> .

@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .

@prefix xml: <http://www.w3.org/XML/1998/namespace> .

@prefix xml: <http://www.w3.org/XML/1998/namespace/> .

@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .

@prefix foaf: <http://xmlns.com/foaf/0.1/> .

@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@@ -10,7 +10,7 @@ 
@prefix vann: <http://purl.org/vocab/vann/> .

@prefix voaf: <http://purl.org/vocommons/voaf#> .

@prefix geosp: <http://www.opengis.net/ont/geosparql#> .

@prefix saref: <https://saref.etsi.org/saref/> .

@prefix saref: <https://saref.etsi.org/core/> .

@prefix s4city: <https://saref.etsi.org/saref4city/> .

@prefix s4syst: <https://saref.etsi.org/saref4syst/> .

@prefix s4wear: <https://saref.etsi.org/saref4wear/> .
@@ -20,11 +20,11 @@ 
<https://saref.etsi.org/saref4wear/> rdf:type owl:Ontology ;

                                      owl:versionIRI <https://saref.etsi.org/saref4wear/v0.1.2/saref4wear/> ;

                                      dcterms:contributor <https://www.linkedin.com/in/maurodragoni/MauroDragoni> ;

                                      dcterms:created "start date of the STF 2019-01-01"^^xsd:date ;

                                      dcterms:created "2019-01-01"^^xsd:date ;

                                      dcterms:description "SAREF4WEAR is an extension of SAREF for Wearables"@en ;

                                      dcterms:issued "date when the document is online"^^xsd:date ;

                                      dcterms:issued "2020-02-01"^^xsd:date ;

                                      dcterms:license <https://forge.etsi.org/etsi-software-license> ;

                                      dcterms:modified "do not set this"^^xsd:date ;

                                      dcterms:modified "2020-02-01"^^xsd:date ;

                                      dcterms:publisher <https://www.etsi.org/> ;

                                      dcterms:source <https://forge.etsi.org/rep/SAREF/saref4wear/> ;

                                      dcterms:title "SAREF4WEAR: an extension of SAREF for Wearables"@en ;
@@ -116,62 +116,62 @@ geo:location rdf:type owl:ObjectProperty ; 
             rdfs:label "location" .





###  https://saref.etsi.org/saref/controlsProperty

###  https://saref.etsi.org/core/controlsProperty

saref:controlsProperty rdf:type owl:ObjectProperty ;

                       rdfs:isDefinedBy saref: ;

                       rdfs:label "controls property"@en .





###  https://saref.etsi.org/saref/hasFunction

###  https://saref.etsi.org/core/hasFunction

saref:hasFunction rdf:type owl:ObjectProperty ;

                  rdfs:domain s4wear:Wearable ;

                  rdfs:range saref:Function .





###  https://saref.etsi.org/saref/isControlledByDevice

###  https://saref.etsi.org/core/isControlledByDevice

saref:isControlledByDevice rdf:type owl:ObjectProperty ;

                           rdfs:isDefinedBy saref: ;

                           rdfs:label "is controlled by device"@en .





###  https://saref.etsi.org/saref/isMeasuredByDevice

###  https://saref.etsi.org/core/isMeasuredByDevice

saref:isMeasuredByDevice rdf:type owl:ObjectProperty ;

                         rdfs:isDefinedBy saref: ;

                         rdfs:label "is measured by device"@en .





###  https://saref.etsi.org/saref/isMeasuredIn

###  https://saref.etsi.org/core/isMeasuredIn

saref:isMeasuredIn rdf:type owl:ObjectProperty ;

                   rdfs:isDefinedBy saref: ;

                   rdfs:label "is measured in"@en .





###  https://saref.etsi.org/saref/makesMeasurement

###  https://saref.etsi.org/core/makesMeasurement

saref:makesMeasurement rdf:type owl:ObjectProperty ;

                       owl:inverseOf saref:measurementMadeBy ;

                       rdfs:isDefinedBy saref: ;

                       rdfs:label "makes measurement"@en .





###  https://saref.etsi.org/saref/measurementMadeBy

###  https://saref.etsi.org/core/measurementMadeBy

saref:measurementMadeBy rdf:type owl:ObjectProperty ;

                        rdfs:isDefinedBy saref: ;

                        rdfs:label "measurement made by"@en .





###  https://saref.etsi.org/saref/measuresProperty

###  https://saref.etsi.org/core/measuresProperty

saref:measuresProperty rdf:type owl:ObjectProperty ;

                       rdfs:isDefinedBy saref: ;

                       rdfs:label "measures property"@en .





###  https://saref.etsi.org/saref/relatesToMeasurement

###  https://saref.etsi.org/core/relatesToMeasurement

saref:relatesToMeasurement rdf:type owl:ObjectProperty ;

                           rdfs:isDefinedBy saref: ;

                           rdfs:label "relates to measurement"@en .





###  https://saref.etsi.org/saref/relatesToProperty

###  https://saref.etsi.org/core/relatesToProperty

saref:relatesToProperty rdf:type owl:ObjectProperty ;

                        rdfs:isDefinedBy saref: ;

                        rdfs:label "relates to property"@en .
@@ -190,7 +190,7 @@ s4syst:connectedTo rdf:type owl:ObjectProperty . 


###  https://saref.etsi.org/saref4wear/actsOn

s4wear:actsOn rdf:type owl:ObjectProperty ;

              rdfs:domain s4wear:ActionFunction ;

              rdfs:domain saref:ActuatingFunction ;

              rdfs:range s4wear:ActuableObject .
@@ -275,14 +275,13 @@ s4wear:isLocatedOn rdf:type owl:ObjectProperty ; 
s4wear:isSensedBy rdf:type owl:ObjectProperty ;

                  rdfs:domain s4wear:Wearer ;

                  rdfs:range s4wear:Wearable ;

                  rdfs:comment "Defines the relatonship between a wearer and a wearable device.

The definition of this object property satisfies the requirement WEAR-2." ;

                  rdfs:comment "Defines the relatonship between a wearer and a wearable device. The definition of this object property satisfies the requirement WEAR-2." ;

                  rdfs:label "is sensed by"@en .





###  https://saref.etsi.org/saref4wear/isTriggeredBy

s4wear:isTriggeredBy rdf:type owl:ObjectProperty ;

                     rdfs:domain s4wear:ActionFunction ;

                     rdfs:domain saref:ActuatingFunction ;

                     rdfs:range saref:Device .
@@ -315,20 +314,20 @@ s4city:takesPlaceAt rdf:type owl:ObjectProperty ; 
###  https://saref.etsi.org/saref4wear/triggers

s4wear:triggers rdf:type owl:ObjectProperty ;

                rdfs:domain saref:Device ;

                rdfs:range s4wear:ActionFunction .

                rdfs:range saref:ActuatingFunction .





#################################################################

#    Data properties

#################################################################



###  https://saref.etsi.org/saref/hasTimestamp

###  https://saref.etsi.org/core/hasTimestamp

saref:hasTimestamp rdf:type owl:DatatypeProperty ;

                   rdfs:isDefinedBy saref: ;

                   rdfs:label "has timestamp"@en .





###  https://saref.etsi.org/saref/hasValue

###  https://saref.etsi.org/core/hasValue

saref:hasValue rdf:type owl:DatatypeProperty ;

               rdfs:isDefinedBy saref: ;

               rdfs:label "has value"@en .
@@ -360,7 +359,7 @@ s4wear:hasCapacity rdf:type owl:DatatypeProperty ; 


###  https://saref.etsi.org/saref4wear/hasCommand

s4wear:hasCommand rdf:type owl:DatatypeProperty ;

                  rdfs:domain s4wear:ActionFunction ;

                  rdfs:domain saref:ActuatingFunction ;

                  rdfs:range xsd:string .
@@ -370,12 +369,6 @@ s4wear:hasDataTransmissionRate rdf:type owl:DatatypeProperty ; 
                               rdfs:range xsd:double .





###  https://saref.etsi.org/saref4wear/hasWidth

s4wear:hasWidth rdf:type owl:DatatypeProperty ;

                rdfs:domain s4wear:Wearable ;

                rdfs:range xsd:double .





###  https://saref.etsi.org/saref4wear/hasHeight

s4wear:hasHeight rdf:type owl:DatatypeProperty ;

                 rdfs:domain s4wear:Wearable ;
@@ -406,6 +399,12 @@ s4wear:hasWeight rdf:type owl:DatatypeProperty ; 
                 rdfs:range xsd:double .





###  https://saref.etsi.org/saref4wear/hasWidth

s4wear:hasWidth rdf:type owl:DatatypeProperty ;

                rdfs:domain s4wear:Wearable ;

                rdfs:range xsd:double .





###  https://saref.etsi.org/saref4wear/meansOfTransport

s4wear:meansOfTransport rdf:type owl:DatatypeProperty ;

                        rdfs:domain saref:FeatureOfInterest ;
@@ -479,12 +478,18 @@ geo:Point rdf:type owl:Class ; 
foaf:Person rdf:type owl:Class .





###  https://saref.etsi.org/saref/Actuator

###  https://saref.etsi.org/core/ActuatingFunction

saref:ActuatingFunction rdf:type owl:Class ;

                        rdfs:subClassOf saref:Function ;

                        rdfs:label "Action function"@en .





###  https://saref.etsi.org/core/Actuator

saref:Actuator rdf:type owl:Class ;

               rdfs:subClassOf s4wear:WearableComponent .





###  https://saref.etsi.org/saref/Device

###  https://saref.etsi.org/core/Device

saref:Device rdf:type owl:Class ;

             rdfs:subClassOf s4wear:PhysicalObject ,

                             [ rdf:type owl:Restriction ;
@@ -507,15 +512,15 @@ saref:Device rdf:type owl:Class ; 
             rdfs:label "Device"@en .





###  https://saref.etsi.org/saref/FeatureOfInterest

###  https://saref.etsi.org/core/FeatureOfInterest

saref:FeatureOfInterest rdf:type owl:Class .





###  https://saref.etsi.org/saref/Function

###  https://saref.etsi.org/core/Function

saref:Function rdf:type owl:Class .





###  https://saref.etsi.org/saref/Measurement

###  https://saref.etsi.org/core/Measurement

saref:Measurement rdf:type owl:Class ;

                  rdfs:subClassOf [ rdf:type owl:Restriction ;

                                    owl:onProperty saref:isMeasuredIn ;
@@ -552,7 +557,7 @@ saref:Measurement rdf:type owl:Class ; 
                  rdfs:label "Measurement"@en .





###  https://saref.etsi.org/saref/Property

###  https://saref.etsi.org/core/Property

saref:Property rdf:type owl:Class ;

               rdfs:subClassOf [ rdf:type owl:Restriction ;

                                 owl:onProperty saref:isControlledByDevice ;
@@ -570,12 +575,12 @@ saref:Property rdf:type owl:Class ; 
               rdfs:label "Property"@en .





###  https://saref.etsi.org/saref/SensingFunction

###  https://saref.etsi.org/core/SensingFunction

saref:SensingFunction rdf:type owl:Class ;

                      rdfs:subClassOf saref:Function .





###  https://saref.etsi.org/saref/Sensor

###  https://saref.etsi.org/core/Sensor

saref:Sensor rdf:type owl:Class ;

             rdfs:subClassOf saref:Device ,

                             s4wear:WearableComponent ;
@@ -583,7 +588,7 @@ saref:Sensor rdf:type owl:Class ; 
             rdfs:label "Sensor"@en .





###  https://saref.etsi.org/saref/UnitOfMeasure

###  https://saref.etsi.org/core/UnitOfMeasure

saref:UnitOfMeasure rdf:type owl:Class ;

                    rdfs:isDefinedBy saref: ;

                    rdfs:label "Unit of measure"@en .
@@ -622,12 +627,6 @@ s4city:Facility rdf:type owl:Class ; 
                rdfs:label "Facility"@en .





###  https://saref.etsi.org/saref4wear/ActionFunction

s4wear:ActionFunction rdf:type owl:Class ;

                      rdfs:subClassOf saref:Function ;

                      rdfs:label "Action function"@en .





###  https://saref.etsi.org/saref4wear/ActuableObject

s4wear:ActuableObject rdf:type owl:Class ;

                      rdfs:label "Actuable object"@en .
@@ -646,8 +645,8 @@ s4wear:CommunicationFunction rdf:type owl:Class ; 
                             rdfs:label "Communication function"@en .





###  https://saref.etsi.org/saref4wear/ControlFunction

s4wear:ControlFunction rdf:type owl:Class ;

###  https://saref.etsi.org/saref4wear/ControllingFunction

s4wear:ControllingFunction rdf:type owl:Class ;

                           rdfs:subClassOf saref:Function ;

                           rdfs:label "Control function"@en .
@@ -856,8 +855,7 @@ s4wear:Wearer rdf:type owl:Class ; 
                                owl:onProperty saref:hasProperty ;

                                owl:allValuesFrom s4wear:WearerProperty

                              ] ;

              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 ;

              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 ;

              rdfs:label "Wearer"@en .