Commit dac1831c authored by Mauro Dragoni's avatar Mauro Dragoni
Browse files

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

parent dbe1ff63
...@@ -2,3 +2,8 @@ ...@@ -2,3 +2,8 @@
.project .project
.classpath .classpath
.settings .settings
*~
saref-pipeline.jar
.DS_Store
target
catalog-v001.xml
...@@ -21,4 +21,3 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ...@@ -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 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 OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE. OF THE POSSIBILITY OF SUCH DAMAGE.
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
@prefix geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> . @prefix geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> .
@prefix owl: <http://www.w3.org/2002/07/owl#> . @prefix owl: <http://www.w3.org/2002/07/owl#> .
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> . @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 xsd: <http://www.w3.org/2001/XMLSchema#> .
@prefix foaf: <http://xmlns.com/foaf/0.1/> . @prefix foaf: <http://xmlns.com/foaf/0.1/> .
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> . @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
@prefix vann: <http://purl.org/vocab/vann/> . @prefix vann: <http://purl.org/vocab/vann/> .
@prefix voaf: <http://purl.org/vocommons/voaf#> . @prefix voaf: <http://purl.org/vocommons/voaf#> .
@prefix geosp: <http://www.opengis.net/ont/geosparql#> . @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 s4city: <https://saref.etsi.org/saref4city/> .
@prefix s4syst: <https://saref.etsi.org/saref4syst/> . @prefix s4syst: <https://saref.etsi.org/saref4syst/> .
@prefix s4wear: <https://saref.etsi.org/saref4wear/> . @prefix s4wear: <https://saref.etsi.org/saref4wear/> .
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
<https://saref.etsi.org/saref4wear/> rdf:type owl:Ontology ; <https://saref.etsi.org/saref4wear/> rdf:type owl:Ontology ;
owl:versionIRI <https://saref.etsi.org/saref4wear/v0.1.2/saref4wear/> ; owl:versionIRI <https://saref.etsi.org/saref4wear/v0.1.2/saref4wear/> ;
dcterms:contributor <https://www.linkedin.com/in/maurodragoni/MauroDragoni> ; 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: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: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:publisher <https://www.etsi.org/> ;
dcterms:source <https://forge.etsi.org/rep/SAREF/saref4wear/> ; dcterms:source <https://forge.etsi.org/rep/SAREF/saref4wear/> ;
dcterms:title "SAREF4WEAR: an extension of SAREF for Wearables"@en ; dcterms:title "SAREF4WEAR: an extension of SAREF for Wearables"@en ;
...@@ -116,62 +116,62 @@ geo:location rdf:type owl:ObjectProperty ; ...@@ -116,62 +116,62 @@ geo:location rdf:type owl:ObjectProperty ;
rdfs:label "location" . rdfs:label "location" .
### https://saref.etsi.org/saref/controlsProperty ### https://saref.etsi.org/core/controlsProperty
saref:controlsProperty rdf:type owl:ObjectProperty ; saref:controlsProperty rdf:type owl:ObjectProperty ;
rdfs:isDefinedBy saref: ; rdfs:isDefinedBy saref: ;
rdfs:label "controls property"@en . rdfs:label "controls property"@en .
### https://saref.etsi.org/saref/hasFunction ### https://saref.etsi.org/core/hasFunction
saref:hasFunction rdf:type owl:ObjectProperty ; saref:hasFunction rdf:type owl:ObjectProperty ;
rdfs:domain s4wear:Wearable ; rdfs:domain s4wear:Wearable ;
rdfs:range saref:Function . rdfs:range saref:Function .
### https://saref.etsi.org/saref/isControlledByDevice ### https://saref.etsi.org/core/isControlledByDevice
saref:isControlledByDevice rdf:type owl:ObjectProperty ; saref:isControlledByDevice rdf:type owl:ObjectProperty ;
rdfs:isDefinedBy saref: ; rdfs:isDefinedBy saref: ;
rdfs:label "is controlled by device"@en . 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 ; saref:isMeasuredByDevice rdf:type owl:ObjectProperty ;
rdfs:isDefinedBy saref: ; rdfs:isDefinedBy saref: ;
rdfs:label "is measured by device"@en . 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 ; saref:isMeasuredIn rdf:type owl:ObjectProperty ;
rdfs:isDefinedBy saref: ; rdfs:isDefinedBy saref: ;
rdfs:label "is measured in"@en . rdfs:label "is measured in"@en .
### https://saref.etsi.org/saref/makesMeasurement ### https://saref.etsi.org/core/makesMeasurement
saref:makesMeasurement rdf:type owl:ObjectProperty ; saref:makesMeasurement rdf:type owl:ObjectProperty ;
owl:inverseOf saref:measurementMadeBy ; owl:inverseOf saref:measurementMadeBy ;
rdfs:isDefinedBy saref: ; rdfs:isDefinedBy saref: ;
rdfs:label "makes measurement"@en . rdfs:label "makes measurement"@en .
### https://saref.etsi.org/saref/measurementMadeBy ### https://saref.etsi.org/core/measurementMadeBy
saref:measurementMadeBy rdf:type owl:ObjectProperty ; saref:measurementMadeBy rdf:type owl:ObjectProperty ;
rdfs:isDefinedBy saref: ; rdfs:isDefinedBy saref: ;
rdfs:label "measurement made by"@en . rdfs:label "measurement made by"@en .
### https://saref.etsi.org/saref/measuresProperty ### https://saref.etsi.org/core/measuresProperty
saref:measuresProperty rdf:type owl:ObjectProperty ; saref:measuresProperty rdf:type owl:ObjectProperty ;
rdfs:isDefinedBy saref: ; rdfs:isDefinedBy saref: ;
rdfs:label "measures property"@en . rdfs:label "measures property"@en .
### https://saref.etsi.org/saref/relatesToMeasurement ### https://saref.etsi.org/core/relatesToMeasurement
saref:relatesToMeasurement rdf:type owl:ObjectProperty ; saref:relatesToMeasurement rdf:type owl:ObjectProperty ;
rdfs:isDefinedBy saref: ; rdfs:isDefinedBy saref: ;
rdfs:label "relates to measurement"@en . rdfs:label "relates to measurement"@en .
### https://saref.etsi.org/saref/relatesToProperty ### https://saref.etsi.org/core/relatesToProperty
saref:relatesToProperty rdf:type owl:ObjectProperty ; saref:relatesToProperty rdf:type owl:ObjectProperty ;
rdfs:isDefinedBy saref: ; rdfs:isDefinedBy saref: ;
rdfs:label "relates to property"@en . rdfs:label "relates to property"@en .
...@@ -189,7 +189,7 @@ s4syst:connectedTo rdf:type owl:ObjectProperty . ...@@ -189,7 +189,7 @@ s4syst:connectedTo rdf:type owl:ObjectProperty .
### https://saref.etsi.org/saref4wear/actsOn ### https://saref.etsi.org/saref4wear/actsOn
s4wear:actsOn rdf:type owl:ObjectProperty ; s4wear:actsOn rdf:type owl:ObjectProperty ;
rdfs:domain s4wear:ActionFunction ; rdfs:domain saref:ActuatingFunction ;
rdfs:range s4wear:ActuableObject . rdfs:range s4wear:ActuableObject .
...@@ -272,14 +272,13 @@ s4wear:isLocatedOn rdf:type owl:ObjectProperty ; ...@@ -272,14 +272,13 @@ 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 .
### https://saref.etsi.org/saref4wear/isTriggeredBy ### https://saref.etsi.org/saref4wear/isTriggeredBy
s4wear:isTriggeredBy rdf:type owl:ObjectProperty ; s4wear:isTriggeredBy rdf:type owl:ObjectProperty ;
rdfs:domain s4wear:ActionFunction ; rdfs:domain saref:ActuatingFunction ;
rdfs:range saref:Device . rdfs:range saref:Device .
...@@ -306,20 +305,20 @@ s4wear:sendsNotificationsTo rdf:type owl:ObjectProperty ; ...@@ -306,20 +305,20 @@ s4wear:sendsNotificationsTo rdf:type owl:ObjectProperty ;
### https://saref.etsi.org/saref4wear/triggers ### https://saref.etsi.org/saref4wear/triggers
s4wear:triggers rdf:type owl:ObjectProperty ; s4wear:triggers rdf:type owl:ObjectProperty ;
rdfs:domain saref:Device ; rdfs:domain saref:Device ;
rdfs:range s4wear:ActionFunction . rdfs:range saref:ActuatingFunction .
################################################################# #################################################################
# Data properties # Data properties
################################################################# #################################################################
### https://saref.etsi.org/saref/hasTimestamp ### https://saref.etsi.org/core/hasTimestamp
saref:hasTimestamp rdf:type owl:DatatypeProperty ; saref:hasTimestamp rdf:type owl:DatatypeProperty ;
rdfs:isDefinedBy saref: ; rdfs:isDefinedBy saref: ;
rdfs:label "has timestamp"@en . rdfs:label "has timestamp"@en .
### https://saref.etsi.org/saref/hasValue ### https://saref.etsi.org/core/hasValue
saref:hasValue rdf:type owl:DatatypeProperty ; saref:hasValue rdf:type owl:DatatypeProperty ;
rdfs:isDefinedBy saref: ; rdfs:isDefinedBy saref: ;
rdfs:label "has value"@en . rdfs:label "has value"@en .
...@@ -357,7 +356,7 @@ s4wear:hasCapacity rdf:type owl:DatatypeProperty ; ...@@ -357,7 +356,7 @@ s4wear:hasCapacity rdf:type owl:DatatypeProperty ;
### https://saref.etsi.org/saref4wear/hasCommand ### https://saref.etsi.org/saref4wear/hasCommand
s4wear:hasCommand rdf:type owl:DatatypeProperty ; s4wear:hasCommand rdf:type owl:DatatypeProperty ;
rdfs:domain s4wear:ActionFunction ; rdfs:domain saref:ActuatingFunction ;
rdfs:range xsd:string . rdfs:range xsd:string .
...@@ -367,12 +366,6 @@ s4wear:hasDataTransmissionRate rdf:type owl:DatatypeProperty ; ...@@ -367,12 +366,6 @@ s4wear:hasDataTransmissionRate rdf:type owl:DatatypeProperty ;
rdfs:range xsd:double . 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 ### https://saref.etsi.org/saref4wear/hasHeight
s4wear:hasHeight rdf:type owl:DatatypeProperty ; s4wear:hasHeight rdf:type owl:DatatypeProperty ;
rdfs:domain s4wear:Wearable ; rdfs:domain s4wear:Wearable ;
...@@ -403,6 +396,12 @@ s4wear:hasWeight rdf:type owl:DatatypeProperty ; ...@@ -403,6 +396,12 @@ s4wear:hasWeight rdf:type owl:DatatypeProperty ;
rdfs:range xsd:double . 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 ### https://saref.etsi.org/saref4wear/meansOfTransport
s4wear:meansOfTransport rdf:type owl:DatatypeProperty ; s4wear:meansOfTransport rdf:type owl:DatatypeProperty ;
rdfs:domain saref:FeatureOfInterest ; rdfs:domain saref:FeatureOfInterest ;
...@@ -476,12 +475,18 @@ geo:Point rdf:type owl:Class ; ...@@ -476,12 +475,18 @@ geo:Point rdf:type owl:Class ;
foaf:Person 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 ; saref:Actuator rdf:type owl:Class ;
rdfs:subClassOf s4wear:WearableComponent . rdfs:subClassOf s4wear:WearableComponent .
### https://saref.etsi.org/saref/Device ### https://saref.etsi.org/core/Device
saref:Device rdf:type owl:Class ; saref:Device rdf:type owl:Class ;
rdfs:subClassOf s4wear:PhysicalObject , rdfs:subClassOf s4wear:PhysicalObject ,
[ rdf:type owl:Restriction ; [ rdf:type owl:Restriction ;
...@@ -508,15 +513,15 @@ saref:Device rdf:type owl:Class ; ...@@ -508,15 +513,15 @@ saref:Device rdf:type owl:Class ;
rdfs:label "Device"@en . rdfs:label "Device"@en .
### https://saref.etsi.org/saref/FeatureOfInterest ### https://saref.etsi.org/core/FeatureOfInterest
saref:FeatureOfInterest rdf:type owl:Class . saref:FeatureOfInterest rdf:type owl:Class .
### https://saref.etsi.org/saref/Function ### https://saref.etsi.org/core/Function
saref:Function rdf:type owl:Class . saref:Function rdf:type owl:Class .
### https://saref.etsi.org/saref/Measurement ### https://saref.etsi.org/core/Measurement
saref:Measurement rdf:type owl:Class ; saref:Measurement rdf:type owl:Class ;
rdfs:subClassOf [ rdf:type owl:Restriction ; rdfs:subClassOf [ rdf:type owl:Restriction ;
owl:onProperty saref:isMeasuredIn ; owl:onProperty saref:isMeasuredIn ;
...@@ -553,7 +558,7 @@ saref:Measurement rdf:type owl:Class ; ...@@ -553,7 +558,7 @@ saref:Measurement rdf:type owl:Class ;
rdfs:label "Measurement"@en . rdfs:label "Measurement"@en .
### https://saref.etsi.org/saref/Property ### https://saref.etsi.org/core/Property
saref:Property rdf:type owl:Class ; saref:Property rdf:type owl:Class ;
rdfs:subClassOf [ rdf:type owl:Restriction ; rdfs:subClassOf [ rdf:type owl:Restriction ;
owl:onProperty saref:isControlledByDevice ; owl:onProperty saref:isControlledByDevice ;
...@@ -571,12 +576,12 @@ saref:Property rdf:type owl:Class ; ...@@ -571,12 +576,12 @@ saref:Property rdf:type owl:Class ;
rdfs:label "Property"@en . rdfs:label "Property"@en .
### https://saref.etsi.org/saref/SensingFunction ### https://saref.etsi.org/core/SensingFunction
saref:SensingFunction rdf:type owl:Class ; saref:SensingFunction rdf:type owl:Class ;
rdfs:subClassOf saref:Function . rdfs:subClassOf saref:Function .
### https://saref.etsi.org/saref/Sensor ### https://saref.etsi.org/core/Sensor
saref:Sensor rdf:type owl:Class ; saref:Sensor rdf:type owl:Class ;
rdfs:subClassOf saref:Device , rdfs:subClassOf saref:Device ,
s4wear:WearableComponent ; s4wear:WearableComponent ;
...@@ -584,7 +589,7 @@ saref:Sensor rdf:type owl:Class ; ...@@ -584,7 +589,7 @@ saref:Sensor rdf:type owl:Class ;
rdfs:label "Sensor"@en . rdfs:label "Sensor"@en .
### https://saref.etsi.org/saref/UnitOfMeasure ### https://saref.etsi.org/core/UnitOfMeasure
saref:UnitOfMeasure rdf:type owl:Class ; saref:UnitOfMeasure rdf:type owl:Class ;
rdfs:isDefinedBy saref: ; rdfs:isDefinedBy saref: ;
rdfs:label "Unit of measure"@en . rdfs:label "Unit of measure"@en .
...@@ -622,12 +627,6 @@ s4city:Facility rdf:type owl:Class ; ...@@ -622,12 +627,6 @@ s4city:Facility rdf:type owl:Class ;
rdfs:label "Facility"@en . 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 ### https://saref.etsi.org/saref4wear/ActuableObject
s4wear:ActuableObject rdf:type owl:Class ; s4wear:ActuableObject rdf:type owl:Class ;
rdfs:label "Actuable object"@en . rdfs:label "Actuable object"@en .
...@@ -650,8 +649,8 @@ s4wear:CommunicationFunction rdf:type owl:Class ; ...@@ -650,8 +649,8 @@ s4wear:CommunicationFunction rdf:type owl:Class ;
rdfs:label "Communication function"@en . rdfs:label "Communication function"@en .
### https://saref.etsi.org/saref4wear/ControlFunction ### https://saref.etsi.org/saref4wear/ControllingFunction
s4wear:ControlFunction rdf:type owl:Class ; s4wear:ControllingFunction rdf:type owl:Class ;
rdfs:subClassOf saref:Function ; rdfs:subClassOf saref:Function ;
rdfs:label "Control function"@en . rdfs:label "Control function"@en .
...@@ -795,8 +794,7 @@ s4wear:User rdf:type owl:Class ; ...@@ -795,8 +794,7 @@ 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 .
...@@ -815,8 +813,7 @@ s4wear:Wearer rdf:type owl:Class ; ...@@ -815,8 +813,7 @@ 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 .
......
Markdown is supported
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