Commit 4ffceea0 authored by Maxime Lefrançois's avatar Maxime Lefrançois
Browse files

Issues in TS 103 673 Clause 9.4.5

parent 437bad7c
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
forge.etsi.org/rep/:
  repos:
    - saref/saref-core
+48 −44
Original line number Diff line number Diff line
@@ -7,13 +7,10 @@
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
@prefix vann: <http://purl.org/vocab/vann/>.

<http://www.w3.org/2006/time#DurationDescription>
  rdfs:subClassOf [
      rdf:type owl:Restriction ;
      owl:maxCardinality "1"^^xsd:nonNegativeInteger ;
      owl:onProperty s4ener:xsdDuration ;
    ] ;
.
<http://www.w3.org/2006/time#TemporalEntity> a owl:Class .

<http://www.w3.org/2006/time#DurationDescription> a owl:Class .

<https://saref.etsi.org/saref4ener/>
  rdf:type owl:Ontology ;
  owl:versionIRI <https://saref.etsi.org/saref4ener/v1.1.2/> ;
@@ -29,6 +26,17 @@
  dcterms:license <https://forge.etsi.org/etsi-software-license> ;
  dcterms:publisher <https://www.etsi.org/> ;
.

dcterms:created a owl:AnnotationProperty .
dcterms:modified a owl:AnnotationProperty .
dcterms:creator a owl:AnnotationProperty .
dcterms:title a owl:AnnotationProperty .
dcterms:description a owl:AnnotationProperty .
dcterms:license a owl:AnnotationProperty .
dcterms:publisher a owl:AnnotationProperty .
vann:preferredNamespacePrefix a owl:AnnotationProperty .
vann:preferredNamespaceUri a owl:AnnotationProperty .

s4ener:ActivationDelay
  rdf:type owl:Class ;
  rdfs:comment "The scheduled activation delay for a slot."@en ;
@@ -87,7 +95,6 @@ s4ener:AlternativesGroup
  rdf:type owl:Class ;
  rdfs:comment "A collection of power sequences for a certain profile"@en ;
  rdfs:label "Alternatives group"@en ;
  rdfs:subClassOf owl:Thing ;
  rdfs:subClassOf [
      rdf:type owl:Restriction ;
      owl:allValuesFrom s4ener:PowerProfile ;
@@ -302,12 +309,12 @@ s4ener:EventActionConsume
  rdfs:label "Event action consume"@en ;
  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
@@ -315,12 +322,12 @@ s4ener:EventActionProduce
  rdfs:label "Event action produce"@en ;
  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
@@ -328,12 +335,12 @@ s4ener:EventStateConsume
  rdfs:label "Event state consume"@en ;
  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
@@ -341,12 +348,12 @@ s4ener:EventStateProduce
  rdfs:label "Event state produce"@en ;
  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
@@ -365,7 +372,6 @@ s4ener:LoadControlEventData
  rdf:type owl:Class ;
  rdfs:comment "An event used to send overload warning severity level and related load control commands to a device (e.g. a household appliance or a smart meter)."@en ;
  rdfs:label "Load control event data"@en ;
  rdfs:subClassOf owl:Thing ;
  rdfs:subClassOf [
      rdf:type owl:Restriction ;
      owl:allValuesFrom xsd:dateTime ;
@@ -437,7 +443,6 @@ s4ener:LoadControlStateData
  rdf:type owl:Class ;
  rdfs:comment "The representation of the state of an event used to send overload warning severity level and related load control commands to a device (e.g. a household appliance or a smart meter)."@en ;
  rdfs:label "Load control state data"@en ;
  rdfs:subClassOf owl:Thing ;
  rdfs:subClassOf [
      rdf:type owl:Restriction ;
      owl:allValuesFrom xsd:dateTime ;
@@ -629,7 +634,6 @@ s4ener:PowerSequence
  rdf:type owl:Class ;
  rdfs:comment "The specification of a task, such as wash or tumble dry, according to user preferences and/or manufacturer's settings for a certain device.  It is the most 'coarse' view, a power sequence can represent all single steps of a whole task,where the single steps are represented by slots. If the power sequence is pausable by the bound power sequences client, the property 'saref:isInterruptionPossible' SHALL be present and set to true. Otherwise it SHALL be omitted. If the power sequence is stoppable by the bound power sequences client, the property 'saref:isFlexible' SHALL be present and set to true. Otherwise it SHALL be omitted."@en ;
  rdfs:label "Power sequence"@en ;
  rdfs:subClassOf owl:Thing ;
  rdfs:subClassOf [
      rdf:type owl:Restriction ;
      owl:allValuesFrom s4ener:AlternativesGroup ;
@@ -829,14 +833,14 @@ s4ener:PowerSequenceState
  rdfs:label "Power sequence state"@en ;
  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
@@ -879,7 +883,6 @@ s4ener:Slot
  rdf:type owl:Class ;
  rdfs:comment "The single steps of a power sequence are represented by slots. A slot is associated with a slot number (while a power sequence is associated with a power sequence identifier). The slot numbers of two power sequences should be considered independent from each other, i.e., slot number 7 of sequence 1 describes a different slot than slot number 7 of sequence 2. Therefore a slot is only uniquely identified in combination with a sequence ID. "@en ;
  rdfs:label "Slot"@en ;
  rdfs:subClassOf owl:Thing ;
  rdfs:subClassOf [
      rdf:type owl:Restriction ;
      owl:allValuesFrom saref:Time ;
@@ -1521,6 +1524,7 @@ s4ener:vendorName
  rdfs:label "vendor name"@en ;
  rdfs:range xsd:string ;
.
xsd:duration a rdfs:Datatype .
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: