From 56e97e95e38ea27bc4af83d6f53cfc0c2fa82050 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20Lefran=C3=A7ois?= Date: Thu, 2 Apr 2020 11:05:19 +0200 Subject: [PATCH 1/4] correct folder structure --- .gitlab-ci.yml | 12 ++++++++++++ {example => examples}/heatingsystem.ttl | 0 2 files changed, 12 insertions(+) create mode 100644 .gitlab-ci.yml rename {example => examples}/heatingsystem.ttl (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..0f2fde9 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,12 @@ +image: openjdk:8-jdk + +check: + 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 -g -s + artifacts: + when: always + paths: + - target/report_output.xml # allows to visualize the report as HTML on the SAREF portal + reports: + junit: target/report_output.xml # allows to visualize the errors when discussing a pull request diff --git a/example/heatingsystem.ttl b/examples/heatingsystem.ttl similarity index 100% rename from example/heatingsystem.ttl rename to examples/heatingsystem.ttl -- GitLab From e2228115d28d1c6217b08debea8db2b8fe1b1766 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20Lefran=C3=A7ois?= Date: Thu, 2 Apr 2020 11:06:15 +0200 Subject: [PATCH 2/4] added .gitignore --- .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3005170 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +*~ +.DS_Store +catalog-v001.xml +target +saref-pipeline.jar +SmartM2M* -- GitLab From 05b5ae618535ba2a998a266cd884da8e073ed834 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20Lefran=C3=A7ois?= Date: Thu, 2 Apr 2020 11:09:48 +0200 Subject: [PATCH 3/4] removed problematic s4ener:xsdDuration, that is not mentioned in the TS --- ontology/saref4ener.ttl | 64 +++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 41 deletions(-) diff --git a/ontology/saref4ener.ttl b/ontology/saref4ener.ttl index 023b25f..235a62d 100644 --- a/ontology/saref4ener.ttl +++ b/ontology/saref4ener.ttl @@ -5,29 +5,35 @@ @prefix owl: . @prefix rdf: . @prefix rdfs: . -@prefix s4ener: . -@prefix saref: . +@prefix s4ener: . +@prefix saref: . @prefix xsd: . +@prefix schema: . - - rdfs:subClassOf [ - rdf:type owl:Restriction ; - owl:maxCardinality "1"^^xsd:nonNegativeInteger ; - owl:onProperty s4ener:xsdDuration ; - ] ; -. - + a owl:Class ; + rdfs:comment "Description of temporal extent structured with separate values for the various elements of a calendar-clock system. The temporal reference system is fixed to Gregorian Calendar, and the range of each of the numeric properties is restricted to xsd:decimal"@en ; + rdfs:label "Duration description"@en . + + rdf:type owl:Ontology ; - dcterms:created "2015-09-04"^^xsd:date ; - dcterms:creator ""^^xsd:string ; + dcterms:creator ; dcterms:description "SAREF4ENER is an extension of SAREF for the Energy domain that was created in collaboration with Energy@Home (http://www.energy-home.it) and EEBus (http://www.eebus.org/en), the major Italy- and Germany-based industry associations, to enable the interconnection of their (different) data models. SAREF4ENER focuses on demand response scenarios, in which customers can offer flexibility to the Smart Grid to manage their smart home devices by means of a Customer Energy Manager (CEM). The CEM is a logical function for optimizing energy consumption and/or production that can reside either in the home gateway or in the cloud. SAREF4ENER is published as an ETSI tecnical specificatoion (ETSI TS 103 410-1)."^^xsd:string ; - dcterms:license ""^^xsd:string ; - dcterms:modified "2016-12-13"^^xsd:date ; - dcterms:publisher ""^^xsd:string ; dcterms:title "SAREF4ENER: an extension of SAREF for the energy domain created in collaboration with Energy@Home and EEBus associations"^^xsd:string ; - owl:imports ; - owl:versionInfo "1.0"^^xsd:string ; + dcterms:license ; + owl:imports ; . + + + a schema:Person; + schema:givenName "Laura" ; + schema:familyName "Daniele" ; + schema:affiliation . + + a schema:Organization ; + schema:name "TNO" . + + + s4ener:ActivationDelay rdf:type owl:Class ; rdfs:comment "The scheduled activation delay for a slot."^^xsd:string ; @@ -1520,27 +1526,3 @@ s4ener:vendorName rdfs:label "vendor name"^^xsd:string ; rdfs:range xsd:string ; . -s4ener:xsdDuration - rdf:type owl:DatatypeProperty ; - rdfs:comment """This property is added to the time:DurationDescription class to allow to express time duration also as xsd:duration. This is necessary because in the EEBus/E@h model time is always expressed as xsd:duration. We use this property to express the following time information in the EEBus/E@h model: -- the startTime of the power sequence (in the PowerSequence class). SHALL be present -- the endTime of the power sequence (in the PowerSequence class). If the value is available, it SHALL be denoted here. Otherwise the element SHALL be omitted. -- the startTime of measurement as absolute or relative value (in the Measurement class). -- the endTime of measurement as absolute or relative value (in the Measurement class)."""^^xsd:string ; - rdfs:label "duration in xsd "^^xsd:string ; - rdfs:range xsd:duration ; -. -[ - rdf:type owl:Class ; - owl:unionOf ( - xsd:int - xsd:double - ) ; -]. -[ - rdf:type owl:Class ; - owl:unionOf ( - xsd:int - xsd:double - ) ; -]. -- GitLab From 26c3741fa18cde3870dffdbd2c58bc3a80ba855c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20Lefran=C3=A7ois?= Date: Thu, 2 Apr 2020 11:13:02 +0200 Subject: [PATCH 4/4] removed inconsistency: some classes were defined as union of strings --- ontology/saref4ener.ttl | 64 ++++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/ontology/saref4ener.ttl b/ontology/saref4ener.ttl index 235a62d..a61d3c6 100644 --- a/ontology/saref4ener.ttl +++ b/ontology/saref4ener.ttl @@ -307,12 +307,12 @@ s4ener:EventActionConsume rdfs:label "Event action consume"^^xsd:string ; rdfs:subClassOf s4ener:LoadControlEventAction ; owl:oneOf ( - "s4ener:pause"^^xsd:string - "s4ener:resume"^^xsd:string - "s4ener:reduce"^^xsd:string - "s4ener:increase"^^xsd:string - "s4ener:emergency"^^xsd:string - "s4ener:normal"^^xsd:string + s4ener:pause + s4ener:resume + s4ener:reduce + s4ener:increase + s4ener:emergency + s4ener:normal ) ; . s4ener:EventActionProduce @@ -320,12 +320,12 @@ s4ener:EventActionProduce rdfs:label "Event action produce"^^xsd:string ; rdfs:subClassOf s4ener:LoadControlEventAction ; owl:oneOf ( - "s4ener:pause"^^xsd:string - "s4ener:resume"^^xsd:string - "s4ener:reduce"^^xsd:string - "s4ener:increase"^^xsd:string - "s4ener:emergency"^^xsd:string - "s4ener:normal"^^xsd:string + s4ener:pause + s4ener:resume + s4ener:reduce + s4ener:increase + s4ener:emergency + s4ener:normal ) ; . s4ener:EventStateConsume @@ -333,12 +333,12 @@ s4ener:EventStateConsume rdfs:label "Event state consume"^^xsd:string ; rdfs:subClassOf s4ener:LoadControlEventState ; owl:oneOf ( - "s4ener:eventAccepted"^^xsd:string - "s4ener:eventStarted"^^xsd:string - "s4ener:eventStopped"^^xsd:string - "s4ener:eventRejected"^^xsd:string - "s4ener:eventCancelled"^^xsd:string - "s4ener:eventError"^^xsd:string + s4ener:eventAccepted + s4ener:eventStarted + s4ener:eventStopped + s4ener:eventRejected + s4ener:eventCancelled + s4ener:eventError ) ; . s4ener:EventStateProduce @@ -346,12 +346,12 @@ s4ener:EventStateProduce rdfs:label "Event state produce"^^xsd:string ; rdfs:subClassOf s4ener:LoadControlEventState ; owl:oneOf ( - "s4ener:eventAccepted"^^xsd:string - "s4ener:eventStarted"^^xsd:string - "s4ener:eventStopped"^^xsd:string - "s4ener:eventRejected"^^xsd:string - "s4ener:eventCancelled"^^xsd:string - "s4ener:eventError"^^xsd:string + s4ener:eventAccepted + s4ener:eventStarted + s4ener:eventStopped + s4ener:eventRejected + s4ener:eventCancelled + s4ener:eventError ) ; . s4ener:LatestEndTime @@ -834,14 +834,14 @@ s4ener:PowerSequenceState rdfs:label "Power sequence state"^^xsd:string ; rdfs:subClassOf s4ener:State ; owl:oneOf ( - "s4ener:running"^^xsd:string - "s4ener:paused"^^xsd:string - "s4ener:scheduled"^^xsd:string - "s4ener:scheduledPaused"^^xsd:string - "s4ener:pending"^^xsd:string - "s4ener:inactive"^^xsd:string - "s4ener:completed"^^xsd:string - "s4ener:invalid"^^xsd:string + s4ener:running + s4ener:paused + s4ener:scheduled + s4ener:scheduledPaused + s4ener:pending + s4ener:inactive + s4ener:completed + s4ener:invalid ) ; . s4ener:PowerSkewness -- GitLab