From 221cfab7f817f2c4a815bf81334d8c27479b1ba2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20Lefran=C3=A7ois?= Date: Fri, 29 May 2020 14:51:58 +0200 Subject: [PATCH 1/4] remove java tag in gitlab-ci --- .gitlab-ci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f3e7a79..d44e5a3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,8 +1,6 @@ image: openjdk:8-jdk develop: - tags: - - java script: - curl -L -o saref-pipeline.jar "https://gitlab.emse.fr/saref/saref-pipeline/-/jobs/artifacts/master/raw/target/saref-pipeline.jar?job=build" - java -jar saref-pipeline.jar develop -s @@ -18,8 +16,6 @@ develop: junit: target/report_output.xml release: - tags: - - java script: - curl -L -o saref-pipeline.jar "https://gitlab.emse.fr/saref/saref-pipeline/-/jobs/artifacts/master/raw/target/saref-pipeline.jar?job=build" - java -jar saref-pipeline.jar release -s -- GitLab From 409e233748aebd7d71f497c07db5798f24e35622 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20Lefran=C3=A7ois?= Date: Fri, 29 May 2020 14:51:58 +0200 Subject: [PATCH 2/4] remove java tag in gitlab-ci --- .gitlab-ci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f3e7a79..d44e5a3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,8 +1,6 @@ image: openjdk:8-jdk develop: - tags: - - java script: - curl -L -o saref-pipeline.jar "https://gitlab.emse.fr/saref/saref-pipeline/-/jobs/artifacts/master/raw/target/saref-pipeline.jar?job=build" - java -jar saref-pipeline.jar develop -s @@ -18,8 +16,6 @@ develop: junit: target/report_output.xml release: - tags: - - java script: - curl -L -o saref-pipeline.jar "https://gitlab.emse.fr/saref/saref-pipeline/-/jobs/artifacts/master/raw/target/saref-pipeline.jar?job=build" - java -jar saref-pipeline.jar release -s -- GitLab From 027a4a87944210a37ecd8d6c9c9f86e72d5e9f76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20Lefran=C3=A7ois?= Date: Thu, 4 Jun 2020 17:00:58 +0200 Subject: [PATCH 4/4] Issues in Clause 9.6.4 --- examples/doorswitch.ttl | 23 +++++++++++++---------- examples/energymeter.ttl | 19 +++++++++++-------- examples/lightswitch.ttl | 19 +++++++++++-------- examples/multimedia.ttl | 2 +- examples/smokesensor.ttl | 29 ++++++++++++++++------------- examples/temperaturesensor.ttl | 23 +++++++++++++---------- examples/unitsmeasure.ttl | 7 ++++--- examples/washingmachine.ttl | 31 +++++++++++++++++++------------ 8 files changed, 88 insertions(+), 65 deletions(-) diff --git a/examples/doorswitch.ttl b/examples/doorswitch.ttl index e593aec..31d4ff9 100644 --- a/examples/doorswitch.ttl +++ b/examples/doorswitch.ttl @@ -15,17 +15,20 @@ dcterms:title "Example doorswitch"@en ; dcterms:description "Example doorswitch"@en . +geo:lat a owl:DatatypeProperty . +geo:long a owl:DatatypeProperty . + ex:BuildingObject_MainDoor - rdf:type saref:Door ; +# rdf:type saref:Door ; rdfs:label "Building object Main door"^^xsd:string ; . ex:BuildingSpace_OfficeHall - rdf:type saref:BuildingSpace ; +# rdf:type saref:BuildingSpace ; rdfs:label "Office Hall"^^xsd:string ; geo:lat "52.0821"^^xsd:string ; geo:long "4.3251"^^xsd:string ; - saref:contains ex:BuildingObject_MainDoor ; - saref:hasSpaceType "Office hall"^^xsd:string ; +# saref:contains ex:BuildingObject_MainDoor ; +# saref:hasSpaceType "Office hall"^^xsd:string ; . ex:CloseCommand rdf:type saref:CloseCommand ; @@ -35,8 +38,8 @@ ex:CloseCommand ex:CloseDoorService rdf:type saref:Service ; rdfs:label "CLOSE Door service "^^xsd:string ; - saref:hasInputParameter ex:OpenState ; - saref:hasOutputParameter ex:CloseState ; +# saref:hasInputParameter ex:OpenState ; +# saref:hasOutputParameter ex:CloseState ; saref:isOfferedBy ex:DoorSwitch_DS3001 ; saref:represents ex:OpenCloseFunction ; . @@ -49,19 +52,19 @@ ex:Comfort rdfs:label "Comfort"^^xsd:string ; . ex:DoorSwitch_DS001 - rdf:type saref:DoorSwitch ; +# rdf:type saref:DoorSwitch ; rdfs:label "Door switch DS3001"^^xsd:string ; - saref:IsUsedFor ex:BuildingObject_MainDoor ; +# saref:IsUsedFor ex:BuildingObject_MainDoor ; saref:accomplishes ex:Comfort ; saref:consistsOf saref:Switch ; - saref:hasCategory saref:Actuator ; +# saref:hasCategory saref:Actuator ; saref:hasDescription "Door switch DS3001 is an example of how to instantiate a door switch using SAREF"^^xsd:string ; saref:hasFunction ex:OpenCloseFunction ; saref:hasManufacturer "manufacturer-mno"^^xsd:string ; saref:hasModel "mno-DS3001-16"^^xsd:string ; saref:hasState ex:CloseState ; saref:hasState ex:OpenState ; - saref:isLocatedIn ex:BuildingSpace_OfficeHall ; +# saref:isLocatedIn ex:BuildingSpace_OfficeHall ; saref:offers ex:CloseDoorService ; . ex:OpenCloseFunction diff --git a/examples/energymeter.ttl b/examples/energymeter.ttl index 1de8db8..8b267c0 100644 --- a/examples/energymeter.ttl +++ b/examples/energymeter.ttl @@ -14,8 +14,11 @@ dcterms:title "Example energymeter"@en ; dcterms:description "Example energymeter"@en . +time:Instant a owl:Class . +time:inXSDDateTime a owl:DatatypeProperty . + ex:MicroRenewable rdf:type owl:Class ; - rdfs:subClassOf saref:FunctionRelated ; +# rdfs:subClassOf saref:FunctionRelated ; rdfs:comment "A device that generates renewable energy from natural resources such as the sun, wind and water. A saref:MicroRenewable is typically used to accomplish saref:EnergyEfficiency."@en ; rdfs:label "Micro renewable"@en . ex:Efficiency @@ -29,11 +32,11 @@ ex:Energy saref:isMeasuredIn ; . ex:EnergyMeter_EM5004 - rdf:type saref:EnergyMeter ; +# rdf:type saref:EnergyMeter ; rdfs:label "Energy meter EM5004"^^xsd:string ; - saref:IsUsedFor ex:Energy ; +# saref:IsUsedFor ex:Energy ; saref:accomplishes ex:Efficiency ; - saref:hasCategory saref:Meter ; +# saref:hasCategory saref:Meter ; saref:hasDescription "Energy meter EM5004 is an example of how to instantiate an energy meter using SAREF"^^xsd:string ; saref:hasFunction ex:MeteringFunction ; saref:hasManufacturer "manufacturer_stv"^^xsd:string ; @@ -59,7 +62,7 @@ ex:Instant_1 ex:MeasureEnergyService rdf:type saref:Service ; rdfs:label "Measure energy service"^^xsd:string ; - saref:hasOutputParameter ex:Energy ; +# saref:hasOutputParameter ex:Energy ; saref:isOfferedBy ex:EnergyMeter_EM5004 ; saref:represents ex:MeteringFunction ; . @@ -67,9 +70,9 @@ ex:MeteringFunction rdf:type saref:MeteringFunction ; rdfs:label "Metering function "^^xsd:string ; saref:hasCommand ex:GetCurrentMeterValueCommand ; - saref:hasMeterReadingTime ex:Time_value1 ; - saref:hasMeterReadingType "Energy"^^xsd:string ; - saref:hasMeterReadingValue ex:Energy_value1 ; +# saref:hasMeterReadingTime ex:Time_value1 ; + saref:hasMeterReadingType saref:Energy ; +# saref:hasMeterReadingValue ex:Energy_value1 ; . ex:Time_value1 rdf:type saref:Time ; diff --git a/examples/lightswitch.ttl b/examples/lightswitch.ttl index ad5d1fe..c4d37dd 100644 --- a/examples/lightswitch.ttl +++ b/examples/lightswitch.ttl @@ -15,16 +15,19 @@ dcterms:title "Example lightswitch"@en ; dcterms:description "Example lightswitch"@en . +geo:lat a owl:DatatypeProperty . +geo:long a owl:DatatypeProperty . + ex:LightingDevice rdf:type owl:Class ; - rdfs:subClassOf saref:FunctionRelated ; +# rdfs:subClassOf saref:FunctionRelated ; rdfs:comment "A device used for illumination, irradiation, signaling, or projection. A saref:LightingDevice is typically used to accomplish saref:Comfort."@en ; rdfs:label "Lighting device"@en . ex:BuildingSpace_OfficeHall - rdf:type saref:BuildingSpace ; +# rdf:type saref:BuildingSpace ; rdfs:label "Office Hall"^^xsd:string ; geo:lat "52.0821"^^xsd:string ; geo:long "4.3251"^^xsd:string ; - saref:hasSpaceType "Office hall"^^xsd:string ; +# saref:hasSpaceType "Office hall"^^xsd:string ; . ex:Light rdf:type saref:Light ; @@ -35,17 +38,17 @@ ex:Light ex:LightSwitch_LS1001 rdf:type saref:LightSwitch ; rdfs:label "Light switch LS1001"^^xsd:string ; - saref:IsUsedFor ex:Light ; +# saref:IsUsedFor ex:Light ; saref:accomplishes ex:Lighting ; saref:consistsOf saref:Switch ; - saref:hasCategory saref:Actuator ; +# saref:hasCategory saref:Actuator ; saref:hasDescription "Light switch LS1001 is an example of how to instantiate a light switch using SAREF"^^xsd:string ; saref:hasFunction ex:OnOffFunction ; saref:hasManufacturer "manufacturer-abc"^^xsd:string ; saref:hasModel "890-09w"^^xsd:string ; saref:hasState ex:OffState ; saref:hasState ex:OnState ; - saref:isLocatedIn ex:BuildingSpace_OfficeHall ; +# saref:isLocatedIn ex:BuildingSpace_OfficeHall ; saref:offers ex:SwitchOnService ; . ex:Lighting @@ -80,8 +83,8 @@ ex:OnState ex:SwitchOnService rdf:type saref:SwitchOnService ; rdfs:label "Switch ON service "^^xsd:string ; - saref:hasInputParameter ex:OffState ; - saref:hasOutputParameter ex:OnState ; +# saref:hasInputParameter ex:OffState ; +# saref:hasOutputParameter ex:OnState ; saref:isOfferedBy ex:LightSwitch_LS1001 ; saref:represents ex:OnOffFunction ; . diff --git a/examples/multimedia.ttl b/examples/multimedia.ttl index 2a62739..ab69242 100644 --- a/examples/multimedia.ttl +++ b/examples/multimedia.ttl @@ -16,7 +16,7 @@ dcterms:description "Example multimedia"@en . ex:Multimedia rdf:type owl:Class ; - rdfs:subClassOf saref:FunctionRelated ; +# rdfs:subClassOf saref:FunctionRelated ; rdfs:comment "A device designed to display, store, record or play multimedia content such as audio, images, animation, video. A saref:Multimedia is typically used to accomplish saref:Entertainment."@en ; rdfs:label "Multimedia"@en . diff --git a/examples/smokesensor.ttl b/examples/smokesensor.ttl index 2527334..5e04c6f 100644 --- a/examples/smokesensor.ttl +++ b/examples/smokesensor.ttl @@ -15,6 +15,9 @@ dcterms:title "Example smokesensor"@en ; dcterms:description "Example smokesensor"@en . +geo:lat a owl:DatatypeProperty . +geo:long a owl:DatatypeProperty . + ex:Audio rdf:type saref:Property ; rdfs:label "Audio"^^xsd:string ; @@ -22,16 +25,16 @@ ex:Audio saref:isMeasuredIn ; . ex:BuildingObject_Window - rdf:type saref:Window ; +# rdf:type saref:Window ; rdfs:label "Window"^^xsd:string ; . ex:BuildingSpace_HotelRoom - rdf:type saref:BuildingSpace ; +# rdf:type saref:BuildingSpace ; rdfs:label "Hotel room"^^xsd:string ; geo:lat "52.0705"^^xsd:string ; geo:long "4.30070"^^xsd:string ; - saref:contains ; - saref:hasSpaceType "Hotel room"^^xsd:string ; +# saref:contains ; +# saref:hasSpaceType "Hotel room"^^xsd:string ; . ex:Comfort rdf:type saref:Task ; @@ -41,7 +44,7 @@ ex:EventFunction rdf:type saref:EventFunction ; rdfs:label "Event function"^^xsd:string ; saref:hasCommand ex:NotifyCommand ; - saref:hasThreshold ex:Smoke_threshold_value ; +# saref:hasThreshold ex:Smoke_threshold_value ; . ex:GetSensingDataCommand rdf:type saref:GetCommand ; @@ -65,8 +68,8 @@ ex:OnState ex:SenseSmoke rdf:type saref:Service ; rdfs:label "Sense smoke"^^xsd:string ; - saref:hasInputParameter ex:Smoke ; - saref:hasOutputParameter ex:Smoke ; +# saref:hasInputParameter ex:Smoke ; +# saref:hasOutputParameter ex:Smoke ; saref:isOfferedBy ex:SmokeSensor_SS4001 ; saref:represents ex:SensingFunction ; . @@ -74,7 +77,7 @@ ex:SensingFunction rdf:type saref:SensingFunction ; rdfs:label "Sensing function"^^xsd:string ; saref:hasCommand ex:GetSensingDataCommand ; - saref:hasSensorType "Smoke"^^xsd:string ; + saref:hasSensorType ex:Smoke ; . ex:Smoke rdf:type saref:Smoke ; @@ -83,17 +86,17 @@ ex:Smoke ex:SmokeAlarm rdf:type saref:Service ; rdfs:label "Smoke alarm"^^xsd:string ; - saref:hasInputParameter ex:Smoke ; - saref:hasOutputParameter ex:Audio ; +# saref:hasInputParameter ex:Smoke ; +# saref:hasOutputParameter ex:Audio ; saref:isOfferedBy ex:SmokeSensor_SS4001 ; saref:represents ex:EventFunction ; . ex:SmokeSensor_SS4001 rdf:type saref:SmokeSensor ; rdfs:label "Smoke sensor SS4001"^^xsd:string ; - saref:IsUsedFor ex:Smoke ; +# saref:IsUsedFor ex:Smoke ; saref:accomplishes saref:Safety ; - saref:hasCategory saref:Sensor ; +# saref:hasCategory saref:Sensor ; saref:hasDescription "Temperature sensor TS2001 is an example of how to instantiate a temperature sensor using SAREF"^^xsd:string ; saref:hasFunction ex:EventFunction ; saref:hasFunction ex:SensingFunction ; @@ -101,7 +104,7 @@ ex:SmokeSensor_SS4001 saref:hasModel "SS-4001-ccsd-15"^^xsd:string ; saref:hasState ex:OffState ; saref:hasState ex:OnState ; - saref:isLocatedIn ex:BuildingSpace_HotelRoom ; +# saref:isLocatedIn ex:BuildingSpace_HotelRoom ; saref:offers ex:SenseSmoke ; saref:offers ex:SmokeAlarm ; . diff --git a/examples/temperaturesensor.ttl b/examples/temperaturesensor.ttl index 85e48c0..df0ff9a 100644 --- a/examples/temperaturesensor.ttl +++ b/examples/temperaturesensor.ttl @@ -15,17 +15,20 @@ dcterms:title "Example temperaturesensor"@en ; dcterms:description "Example temperaturesensor"@en . +geo:lat a owl:DatatypeProperty . +geo:long a owl:DatatypeProperty . + ex:BuildingObject_Window - rdf:type saref:Window ; +# rdf:type saref:Window ; rdfs:label "Window"^^xsd:string ; . ex:BuildingSpace_HotelRoom - rdf:type saref:BuildingSpace ; +# rdf:type saref:BuildingSpace ; rdfs:label "Hotel room"^^xsd:string ; geo:lat "52.0705"^^xsd:string ; geo:long "4.30070"^^xsd:string ; - saref:contains ex:BuildingObject_window ; - saref:hasSpaceType "Hotel room"^^xsd:string ; +# saref:contains ex:BuildingObject_window ; +# saref:hasSpaceType "Hotel room"^^xsd:string ; . ex:Comfort rdf:type saref:Task ; @@ -48,8 +51,8 @@ ex:OnState ex:SenseTemperature rdf:type saref:Service ; rdfs:label "Sense temperature"^^xsd:string ; - saref:hasInputParameter ex:Temperature ; - saref:hasOutputParameter ex:Temperature ; +# saref:hasInputParameter ex:Temperature ; +# saref:hasOutputParameter ex:Temperature ; saref:isOfferedBy ex:TemperatureSensor_TS2001 ; saref:represents ex:SensingFunction ; . @@ -57,7 +60,7 @@ ex:SensingFunction rdf:type saref:SensingFunction ; rdfs:label "Sensing function"^^xsd:string ; saref:hasCommand ex:GetSensingDataCommand ; - saref:hasSensorType "Temperature"^^xsd:string ; + saref:hasSensorType ex:Temperature ; . ex:Temperature rdf:type saref:Temperature ; @@ -67,15 +70,15 @@ ex:Temperature ex:TemperatureSensor_TS2001 rdf:type saref:TemperatureSensor ; rdfs:label "Temperature sensor TS2001"^^xsd:string ; - saref:IsUsedFor ex:Temperature ; +# saref:IsUsedFor ex:Temperature ; saref:accomplishes ex:Comfort ; - saref:hasCategory saref:Sensor ; +# saref:hasCategory saref:Sensor ; saref:hasDescription "Temperature sensor TS2001 is an example of how to instantiate a temperature sensor using SAREF"^^xsd:string ; saref:hasFunction ex:SensingFunction ; saref:hasManufacturer "manufacturer-efg"^^xsd:string ; saref:hasModel "153899L"^^xsd:string ; saref:hasState ex:OffState ; saref:hasState ex:OnState ; - saref:isLocatedIn ex:BuildingSpace_HotelRoom ; +# saref:isLocatedIn ex:BuildingSpace_HotelRoom ; saref:offers ex:SenseTemperature ; . diff --git a/examples/unitsmeasure.ttl b/examples/unitsmeasure.ttl index 66d0107..f20a7d0 100644 --- a/examples/unitsmeasure.ttl +++ b/examples/unitsmeasure.ttl @@ -1,3 +1,4 @@ +@prefix ex: . @prefix om: . @prefix owl: . @prefix rdf: . @@ -59,7 +60,7 @@ om:kilowatt rdf:type owl:NamedIndividual , rdfs:label "kilowatt"@en . -### http://www.wurvoc.org/vocabularies/om-1.8/kilowatt_hour +#### http://www.wurvoc.org/vocabularies/om-1.8/kilowatt_hour om:kilowatt_hour rdf:type owl:NamedIndividual , saref:EnergyUnit ; rdfs:comment "The kilowatt hour is a unit of energy equal to 1,000 watt-hours, or 3.6 megajoules."@en ; @@ -93,8 +94,8 @@ om:watt rdf:type owl:NamedIndividual , rdfs:label "watt"@en . -### https://saref.etsi.org/watt_hour -saref:watt_hour rdf:type owl:NamedIndividual , +#### https://saref.etsi.org/watt_hour +ex:watt_hour rdf:type owl:NamedIndividual , saref:EnergyUnit ; rdfs:comment "The Watt Hor is a unit of energy equivalent to one watt (1 W) of power expended for one hour (1 h) of time. An energy expenditure of 1 Wh represents 3600 joules "@en ; rdfs:label "watt hour"@en . diff --git a/examples/washingmachine.ttl b/examples/washingmachine.ttl index 85e7462..da7791e 100644 --- a/examples/washingmachine.ttl +++ b/examples/washingmachine.ttl @@ -14,9 +14,15 @@ dcterms:title "Example washingmachine"@en ; dcterms:description "Example washingmachine"@en . +time:Instant a owl:Class . +time:Interval a owl:Class . +time:inXSDDateTime a owl:DatatypeProperty . +time:hasBeginning a owl:ObjectProperty . +time:hasEnd a owl:ObjectProperty . + ex:WashingMachine rdf:type owl:Class ; rdfs:subClassOf saref:Appliance , - saref:Load , +# saref:Load , [ rdf:type owl:Restriction ; owl:onProperty saref:hasFunction ; owl:someValuesFrom saref:StartStopFunction @@ -34,11 +40,12 @@ ex:WashingMachine rdf:type owl:Class ; ex:BuildingSpace_LaundryRoom - rdf:type saref:BuildingSpace ; +# rdf:type saref:BuildingSpace ; rdfs:label "Laundry room"^^xsd:string ; - saref:contains ex:WashingMachine_WM802 ; - saref:hasSpaceType "Laundry room"^^xsd:string ; +# saref:contains ex:WashingMachine_WM802 ; +# saref:hasSpaceType "Laundry room"^^xsd:string ; . + ex:Instant_1 rdf:type time:Instant ; rdfs:label "Instant 1"^^xsd:string ; @@ -80,10 +87,10 @@ ex:Price_value1 ex:Profile_1 rdf:type saref:Profile ; rdfs:label "Profile 1"^^xsd:string ; - saref:hasConsumption ex:Power_value2 ; +# saref:hasConsumption ex:Power_value2 ; saref:hasPrice ex:Price_value1 ; - saref:isFlexible "true"^^xsd:boolean ; - saref:isInterruptionPossible "false"^^xsd:boolean ; +# saref:isFlexible "true"^^xsd:boolean ; +# saref:isInterruptionPossible "false"^^xsd:boolean ; . ex:StartCommand rdf:type saref:StartCommand ; @@ -94,8 +101,8 @@ ex:StartCommand ex:StartService rdf:type saref:Service ; rdfs:label "Start service 1"^^xsd:string ; - saref:hasInputParameter ex:StopState ; - saref:hasOutputParameter ex:StartState ; +# saref:hasInputParameter ex:StopState ; +# saref:hasOutputParameter ex:StartState ; saref:isOfferedBy ex:WashingMachine_WM802 ; saref:represents ex:StartStopFunction ; . @@ -123,8 +130,8 @@ ex:WashingMachine_WM802 rdf:type ex:WashingMachine ; rdfs:label "Washing machine WM802"^^xsd:string ; saref:accomplishes saref:Washing ; - saref:hasCategory saref:Appliance ; - saref:hasCategory saref:Load ; +# saref:hasCategory saref:Appliance ; +## saref:hasCategory saref:Load ; saref:hasDescription "Washing machine WM802 is an example of how to instantiate a washing machine using SAREF"^^xsd:string ; saref:hasFunction ex:StartStopFunction ; saref:hasManufacturer "manufacturer-hgfds"^^xsd:string ; @@ -133,6 +140,6 @@ ex:WashingMachine_WM802 saref:hasState ex:StartState ; saref:hasState ex:StopState ; saref:hasTypicalConsumption ex:Power_value1 ; - saref:isLocatedIn ex:BuildingSpace_LaundryRoom ; +# saref:isLocatedIn ex:BuildingSpace_LaundryRoom ; saref:offers ex:StartService ; . -- GitLab