From 7266071928072164ab856f8327fa6dbc6d13f680 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Garc=C3=ADa=20Castro?= Date: Fri, 24 May 2024 17:02:01 +0200 Subject: [PATCH] Updated according to the new actsUpon/observes/control properties --- documentation/description.html | 2 +- ontology/saref4watr.ttl | 34 +--------------------------------- tests/tests.csv | 12 ++++++------ 3 files changed, 8 insertions(+), 40 deletions(-) diff --git a/documentation/description.html b/documentation/description.html index 5f0d71d..dc606c0 100644 --- a/documentation/description.html +++ b/documentation/description.html @@ -22,7 +22,7 @@

SAREF allows to define the temporal extent of a measurement by defining the timestamp for it (using the saref:hasTimestamp property). However, the SAREF4WATR extension also required to be able to define the temporal interval to which a measurement applies, apart from the temporal instant defined by the timestamp. Therefore, the s4watr:hasPhenomenonTime property has been defined in this extension to define the time for which the measurement applies to a feature of interest. The range of this property time has been defined as a time:TemporalEntity, which allows defining temporal intervals or instants.

-

Besides, the extension requires to be able to represent those devices that measure a certain feature of interest (and those features of interest that are measured by a device) independently of having measures from which this relationship could be inferred. Because of this, in this extension we have created four new properties to relate saref:Device and saref:FeatureOfInterest: s4watr:featureIsMeasuredByDevice, s4watr:featureIsControlledByDevice, s4watr:measuresFeature, and s4watr:controlsFeature.

+

Besides, the extension requires to be able to represent those devices that measure a certain feature of interest (and those features of interest that are measured by a device) independently of having measures from which this relationship could be inferred. This can be represented with two properties of SAREF that relate saref:Device and saref:FeatureOfInterest: saref:actsUpon and saref:isActedUponBy.

Measurement model diff --git a/ontology/saref4watr.ttl b/ontology/saref4watr.ttl index 4423738..a4f61df 100644 --- a/ontology/saref4watr.ttl +++ b/ontology/saref4watr.ttl @@ -136,30 +136,6 @@ s4watr:appliesTo rdf:type owl:ObjectProperty ; rdfs:label "applies to"@en . -### https://saref.etsi.org/saref4watr/controlsFeature -s4watr:controlsFeature rdf:type owl:ObjectProperty ; - rdfs:domain saref:Device ; - rdfs:range saref:FeatureOfInterest ; - rdfs:comment "A relationship specifying the features of interest that are controlled by a device."@en ; - rdfs:label "controls feature"@en . - - -### https://saref.etsi.org/saref4watr/featureIsControlledByDevice -s4watr:featureIsControlledByDevice rdf:type owl:ObjectProperty ; - rdfs:domain saref:FeatureOfInterest ; - rdfs:range saref:Device ; - rdfs:comment "A relationship specifying the devices that control a feature of interest."@en ; - rdfs:label "feature is controlled by device"@en . - - -### https://saref.etsi.org/saref4watr/featureIsMeasuredByDevice -s4watr:featureIsMeasuredByDevice rdf:type owl:ObjectProperty ; - rdfs:domain saref:FeatureOfInterest ; - rdfs:range saref:Device ; - rdfs:comment "A relationship specifying the devices that measure a feature of interest."@en ; - rdfs:label "feature is measured by device"@en . - - ### https://saref.etsi.org/saref4watr/forAbsoluteTimeAtDay s4watr:forAbsoluteTimeAtDay rdf:type owl:ObjectProperty ; rdfs:domain s4watr:TimeBasedTariff ; @@ -220,14 +196,6 @@ s4watr:isIntendedFor rdf:type owl:ObjectProperty ; rdfs:label "is intended for"@en . -### https://saref.etsi.org/saref4watr/measuresFeature -s4watr:measuresFeature rdf:type owl:ObjectProperty ; - rdfs:domain saref:Device ; - rdfs:range saref:FeatureOfInterest ; - rdfs:comment "A relationship specifying the features of interest that are measured by a device."@en ; - rdfs:label "measures feature"@en . - - ################################################################# # Data properties ################################################################# @@ -739,7 +707,7 @@ s4watr:WaterMeter rdf:type owl:Class ; owl:maxCardinality "1"^^xsd:nonNegativeInteger ] , [ rdf:type owl:Restriction ; - owl:onProperty saref:measuresProperty ; + owl:onProperty saref:observes ; owl:someValuesFrom s4watr:WaterFlowProperty ] ; rdfs:comment "A water meter is an instrument intended to measure continuously, memorize, and display the volume of water passing through the meter."@en ; diff --git a/tests/tests.csv b/tests/tests.csv index 79294c5..3119196 100644 --- a/tests/tests.csv +++ b/tests/tests.csv @@ -12,7 +12,7 @@ WATR-TEST-10;WATR-5;Water infrastructure;WaterInfrastructure hasSubSystem Actuat WATR-TEST-11;WATR-5;Water infrastructure;Pump subClassOf Actuator WATR-TEST-12;WATR-5;Water infrastructure;Valve subClassOf Actuator WATR-TEST-13;WATR-6;Water meter;WaterMeter subClassOf Device -WATR-TEST-14;WATR-6;Water meter;WaterMeter measuresProperty WaterFlowProperty +WATR-TEST-14;WATR-6;Water meter;WaterMeter observes WaterFlowProperty WATR-TEST-15;WATR-7;Water meter;ColdWaterMeter subClassOf WaterMeter WATR-TEST-16;WATR-8;Water meter;WaterMeter hasFabricationNumber Literal WATR-TEST-17;WATR-9;Water meter;WaterMeter hasManufacturer Literal @@ -33,13 +33,13 @@ WATR-TEST-31;WATR-17;Water meter;BatteryRemainingTime type WaterMeterProperty WATR-TEST-32;WATR-18;Water meter;WaterMeter requiresPower string WATR-TEST-33;WATR-19;Water meter;WaterMeter operatesAtRadioFrequency string WATR-TEST-34;WATR-20;Water meter;WaterMeter hasGeometry Point -WATR-TEST-35;WATR-21;Meter measurements;WaterMeter measuresProperty WaterFlowProperty +WATR-TEST-35;WATR-21;Meter measurements;WaterMeter observes WaterFlowProperty WATR-TEST-36;WATR-21;Meter measurements;FlowVolume type WaterFlowProperty -WATR-TEST-37;WATR-22;Meter measurements;WaterMeter measuresProperty WaterFlowProperty +WATR-TEST-37;WATR-22;Meter measurements;WaterMeter observes WaterFlowProperty WATR-TEST-38;WATR-22;Meter measurements;FlowRate type WaterFlowProperty -WATR-TEST-39;WATR-23;Meter measurements;WaterMeter measuresProperty WaterFlowProperty +WATR-TEST-39;WATR-23;Meter measurements;WaterMeter observes WaterFlowProperty WATR-TEST-40;WATR-23;Meter measurements;ExternalTemperature type EnvironmentalProperty -WATR-TEST-41;WATR-24;Meter measurements;WaterMeter measuresProperty WaterFlowProperty +WATR-TEST-41;WATR-24;Meter measurements;WaterMeter observes WaterFlowProperty WATR-TEST-42;WATR-24;Meter measurements;FlowTemperature type WaterFlowProperty WATR-TEST-43;WATR-25;Meter measurements;WaterMeter makesMeasurement Measurement WATR-TEST-44;WATR-26;Meter measurements;Measurement hasTimestamp dateTime @@ -110,4 +110,4 @@ WATR-TEST-108;WATR-53;ICT4Water cluster;Oxygen type ChemicalProperty WATR-TEST-109;WATR-54;ICT4Water cluster;Humidity type EnvironmentalProperty WATR-TEST-110;WATR-54;ICT4Water cluster;AtmosphericPressure type EnvironmentalProperty WATR-TEST-111;WATR-54;ICT4Water cluster;Precipitation type EnvironmentalProperty -WATR-TEST-112;WATR-55;ICT4Water cluster;Device measuresFeature WaterAsset \ No newline at end of file +WATR-TEST-112;WATR-55;ICT4Water cluster;Device actsUpon WaterAsset \ No newline at end of file -- GitLab