From 5ba80a159e739630db6e1e229fa62b44aa905e75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Garc=C3=ADa=20Castro?= Date: Mon, 10 Jun 2024 17:15:29 +0200 Subject: [PATCH] Updated to use saref:Operation. --- examples/Action.ttl | 16 ++++++++-------- examples/Get.ttl | 36 ++++++++++++++++++------------------ examples/Set.ttl | 16 ++++++++-------- ontology/saref4grid.ttl | 28 ++++++---------------------- 4 files changed, 40 insertions(+), 56 deletions(-) diff --git a/examples/Action.ttl b/examples/Action.ttl index ae34c69..193a3b4 100644 --- a/examples/Action.ttl +++ b/examples/Action.ttl @@ -23,9 +23,9 @@ oneM2M:hasService a owl:ObjectProperty . -oneM2M:hasOperation a owl:ObjectProperty . +saref:hasOperation a owl:ObjectProperty . -oneM2M:hasInput a owl:ObjectProperty . +saref:hasInput a owl:ObjectProperty . ################################################################# @@ -80,11 +80,11 @@ ex:Meter1234 a s4grid:GridMeter, ex:ResetServiceRegister a s4grid:ActionService, owl:NamedIndividual ; - oneM2M:hasOperation ex:ResetServiceOperation . + saref:hasOperation ex:ResetServiceOperation . ex:ResetServiceOperation a s4grid:ActionOperation, owl:NamedIndividual ; - oneM2M:hasInput ex:ResetServiceOperationInput . + saref:hasInput ex:ResetServiceOperationInput . ex:ResetServiceOperationInput a s4grid:SimpleActionOperationInput, owl:NamedIndividual ; @@ -93,11 +93,11 @@ ex:ResetServiceOperationInput a s4grid:SimpleActionOperationInput, ex:PresetAdjustingTimeServiceClock a s4grid:ActionService, owl:NamedIndividual ; - oneM2M:hasOperation ex:PresetAdjustingTimeOperation . + saref:hasOperation ex:PresetAdjustingTimeOperation . ex:PresetAdjustingTimeOperation a s4grid:ActionOperation, owl:NamedIndividual ; - oneM2M:hasInput ex:PresetAdjustingTime1 . + saref:hasInput ex:PresetAdjustingTime1 . ex:PresetAdjustingTime1 a s4grid:PresetAdjustingTime, owl:NamedIndividual ; @@ -108,11 +108,11 @@ ex:PresetAdjustingTime1 a s4grid:PresetAdjustingTime, ex:SpecialDayEntryActivityCalendar a s4grid:ActionService, owl:NamedIndividual ; - oneM2M:hasOperation ex:SpecialDayEntryOperation . + saref:hasOperation ex:SpecialDayEntryOperation . ex:SpecialDayEntryOperation a s4grid:ActionOperation, owl:NamedIndividual ; - oneM2M:hasInput ex:SpecialDayEntry1 . + saref:hasInput ex:SpecialDayEntry1 . ex:SpecialDayEntry1 a s4grid:SpecialDayEntry, owl:NamedIndividual ; diff --git a/examples/Get.ttl b/examples/Get.ttl index cd41263..3412649 100644 --- a/examples/Get.ttl +++ b/examples/Get.ttl @@ -23,11 +23,11 @@ oneM2M:hasService a owl:ObjectProperty . -oneM2M:hasOperation a owl:ObjectProperty . +saref:hasOperation a owl:ObjectProperty . -oneM2M:hasInput a owl:ObjectProperty . +saref:hasInput a owl:ObjectProperty . -oneM2M:hasOutput a owl:ObjectProperty . +saref:hasOutput a owl:ObjectProperty . s4grid:hasSelectiveAccess a owl:ObjectProperty . @@ -96,12 +96,12 @@ ex:Meter1234 a s4grid:GridMeter, ex:GetServiceIncrementalLoadProfile a s4grid:GetService, owl:NamedIndividual ; - oneM2M:hasOperation ex:GetOperationIncrementalLoadProfile . + saref:hasOperation ex:GetOperationIncrementalLoadProfile . ex:GetOperationIncrementalLoadProfile a s4grid:GetOperation, owl:NamedIndividual ; - oneM2M:hasInput ex:OperationInputIncrementalLoadProfile ; - oneM2M:hasOutput ex:OutputIncrementalLoadProfile . + saref:hasInput ex:OperationInputIncrementalLoadProfile ; + saref:hasOutput ex:OutputIncrementalLoadProfile . ex:OperationInputIncrementalLoadProfile a s4grid:CosemOperationInput, owl:NamedIndividual ; @@ -113,12 +113,12 @@ ex:OutputIncrementalLoadProfile a s4grid:GetOperationObjectOutput, ex:GetServiceCapturePeriodIncrementalLoadProfile a s4grid:GetService, owl:NamedIndividual ; - oneM2M:hasOperation ex:GetOperationCapturePeriodIncrementalLoadProfile . + saref:hasOperation ex:GetOperationCapturePeriodIncrementalLoadProfile . ex:GetOperationCapturePeriodIncrementalLoadProfile a s4grid:GetOperation, owl:NamedIndividual ; - oneM2M:hasInput ex:OperationInputCapturePeriodIncrementalLoadProfile ; - oneM2M:hasOutput ex:OutputCapturePeriodIncrementalLoadProfile . + saref:hasInput ex:OperationInputCapturePeriodIncrementalLoadProfile ; + saref:hasOutput ex:OutputCapturePeriodIncrementalLoadProfile . ex:OperationInputCapturePeriodIncrementalLoadProfile a s4grid:GetOperationPropertyInput, owl:NamedIndividual ; @@ -131,12 +131,12 @@ ex:OutputCapturePeriodIncrementalLoadProfile a s4grid:GetOperationDataOutput, ex:GetServiceDisconnectionScript a s4grid:GetService, owl:NamedIndividual ; - oneM2M:hasOperation ex:GetOperationDisconnectionScript . + saref:hasOperation ex:GetOperationDisconnectionScript . ex:GetOperationDisconnectionScript a s4grid:GetOperation, owl:NamedIndividual ; - oneM2M:hasInput ex:OperationInputDisconnectionScript ; - oneM2M:hasOutput ex:OutputDisconnectionScript . + saref:hasInput ex:OperationInputDisconnectionScript ; + saref:hasOutput ex:OutputDisconnectionScript . ex:OperationInputDisconnectionScript a s4grid:GetOperationPropertyInput, owl:NamedIndividual ; @@ -149,13 +149,13 @@ ex:OutputDisconnectionScript a s4grid:GetOperationObjectOutput, ex:GetServiceIncrementalLoadProfileRange a s4grid:GetService, owl:NamedIndividual ; - oneM2M:hasOperation ex:GetOperationIncrementalLoadProfileRange . + saref:hasOperation ex:GetOperationIncrementalLoadProfileRange . ex:GetOperationIncrementalLoadProfileRange a s4grid:GetOperation, owl:NamedIndividual ; - oneM2M:hasInput ex:OperationInputIncrementalLoadProfileRange ; + saref:hasInput ex:OperationInputIncrementalLoadProfileRange ; s4grid:hasSelectiveAccess ex:RangeDescriptor1 ; - oneM2M:hasOutput ex:OutputIncrementalLoadProfileRange . + saref:hasOutput ex:OutputIncrementalLoadProfileRange . ex:OperationInputIncrementalLoadProfileRange a s4grid:CosemOperationInput, owl:NamedIndividual ; @@ -172,13 +172,13 @@ ex:OutputIncrementalLoadProfileRange a s4grid:GetOperationObjectOutput, ex:GetServiceIncrementalLoadProfileEntry a s4grid:GetService, owl:NamedIndividual ; - oneM2M:hasOperation ex:GetOperationIncrementalLoadProfileEntry . + saref:hasOperation ex:GetOperationIncrementalLoadProfileEntry . ex:GetOperationIncrementalLoadProfileEntry a s4grid:GetOperation, owl:NamedIndividual ; - oneM2M:hasInput ex:OperationInputIncrementalLoadProfileEntry ; + saref:hasInput ex:OperationInputIncrementalLoadProfileEntry ; s4grid:hasSelectiveAccess ex:EntryDescriptor1 ; - oneM2M:hasOutput ex:OutputIncrementalLoadProfileEntry . + saref:hasOutput ex:OutputIncrementalLoadProfileEntry . ex:OperationInputIncrementalLoadProfileEntry a s4grid:CosemOperationInput, owl:NamedIndividual ; diff --git a/examples/Set.ttl b/examples/Set.ttl index b4c40ab..43121d0 100644 --- a/examples/Set.ttl +++ b/examples/Set.ttl @@ -23,9 +23,9 @@ oneM2M:hasService a owl:ObjectProperty . -oneM2M:hasOperation a owl:ObjectProperty . +saref:hasOperation a owl:ObjectProperty . -oneM2M:hasInput a owl:ObjectProperty . +saref:hasInput a owl:ObjectProperty . ################################################################# @@ -70,11 +70,11 @@ ex:Meter1234 a s4grid:GridMeter, ex:SetMulticastCommunicationIdentifier a s4grid:SetService, owl:NamedIndividual ; - oneM2M:hasOperation ex:SetOperationMulticastCommunicationIdentifier . + saref:hasOperation ex:SetOperationMulticastCommunicationIdentifier . ex:SetOperationMulticastCommunicationIdentifier a s4grid:SetOperation, owl:NamedIndividual ; - oneM2M:hasInput ex:InputMulticastCommunicationIdentifier . + saref:hasInput ex:InputMulticastCommunicationIdentifier . ex:InputMulticastCommunicationIdentifier a s4grid:SetOperationObisInput, owl:NamedIndividual ; @@ -83,11 +83,11 @@ ex:InputMulticastCommunicationIdentifier a s4grid:SetOperationObisInput, ex:SetServiceCapturePeriodIncrementalLoadProfile a s4grid:SetService, owl:NamedIndividual ; - oneM2M:hasOperation ex:SetOperationCapturePeriodIncrementalLoadProfile . + saref:hasOperation ex:SetOperationCapturePeriodIncrementalLoadProfile . ex:SetOperationCapturePeriodIncrementalLoadProfile a s4grid:SetOperation, owl:NamedIndividual ; - oneM2M:hasInput ex:InputCapturePeriodIncrementalLoadProfile . + saref:hasInput ex:InputCapturePeriodIncrementalLoadProfile . ex:InputCapturePeriodIncrementalLoadProfile a s4grid:SetOperationDataInput, owl:NamedIndividual ; @@ -97,11 +97,11 @@ ex:InputCapturePeriodIncrementalLoadProfile a s4grid:SetOperationDataInput, ex:SetServiceDisconnectionScript a s4grid:SetService, owl:NamedIndividual ; - oneM2M:hasOperation ex:SetOperationDisconnectionScript . + saref:hasOperation ex:SetOperationDisconnectionScript . ex:SetOperationDisconnectionScript a s4grid:SetOperation, owl:NamedIndividual ; - oneM2M:hasInput ex:InputDisconnectionScript . + saref:hasInput ex:InputDisconnectionScript . ex:InputDisconnectionScript a s4grid:SetOperationObjectInput, owl:NamedIndividual ; diff --git a/ontology/saref4grid.ttl b/ontology/saref4grid.ttl index 6c346da..61b3d11 100644 --- a/ontology/saref4grid.ttl +++ b/ontology/saref4grid.ttl @@ -115,18 +115,6 @@ vann:preferredNamespaceUri rdf:type owl:AnnotationProperty . # Object Properties ################################################################# -oneM2M:hasInput a owl:ObjectProperty ; - rdfs:isDefinedBy ; - rdfs:label "has input"@en . - -oneM2M:hasOperation a owl:ObjectProperty ; - rdfs:isDefinedBy ; - rdfs:label "has operation"@en . - -oneM2M:hasOutput a owl:ObjectProperty ; - rdfs:isDefinedBy ; - rdfs:label "has output"@en . - oneM2M:hasService a owl:ObjectProperty ; rdfs:isDefinedBy ; rdfs:label "has service"@en . @@ -642,10 +630,6 @@ oneM2M:OperationOutput a owl:Class ; rdfs:isDefinedBy ; rdfs:label "Operation Output"@en . -oneM2M:Operation a owl:Class ; - rdfs:isDefinedBy ; - rdfs:label "Operation"@en . - oneM2M:Service a owl:Class ; rdfs:isDefinedBy ; rdfs:label "Service"@en ; @@ -696,7 +680,7 @@ saref:UnitOfMeasure a owl:Class ; s4grid:ActionOperation a owl:Class ; rdfs:comment "This class is the means of an action service to communicate in a procedure-type manner over the network (i.e. transmit data to/from other devices). It is the –machine interpretable- exposure of a –human understandable- Command to a network"@en ; rdfs:label "Action Operation"@en ; - rdfs:subClassOf oneM2M:Operation . + rdfs:subClassOf saref:Operation . s4grid:ActionService a owl:Class ; rdfs:comment "This class is a representation of an action function to a network that makes the function discoverable, registerable, remotely controllable by other devices in the network. Actions can be performed over classes that are characterised by an OBIS code"@en ; @@ -842,11 +826,11 @@ s4grid:GetOperation a owl:Class ; rdfs:label "Get Operation"@en ; rdfs:subClassOf [ a owl:Restriction ; owl:cardinality "1"^^xsd:nonNegativeInteger ; - owl:onProperty oneM2M:hasOutput ], + owl:onProperty saref:hasOutput ], [ a owl:Restriction ; owl:cardinality "1"^^xsd:nonNegativeInteger ; - owl:onProperty oneM2M:hasInput ], - oneM2M:Operation . + owl:onProperty saref:hasInput ], + saref:Operation . s4grid:GetService a owl:Class ; rdfs:comment "This class is a representation of a get function to a network that makes the function discoverable, registerable, remotely controllable by other devices in the network"@en ; @@ -1000,8 +984,8 @@ s4grid:SetOperation a owl:Class ; rdfs:label "Set Operation"@en ; rdfs:subClassOf [ a owl:Restriction ; owl:cardinality "1"^^xsd:nonNegativeInteger ; - owl:onProperty oneM2M:hasInput ], - oneM2M:Operation . + owl:onProperty saref:hasInput ], + saref:Operation . s4grid:SetService a owl:Class ; rdfs:comment "This class is a representation of a set function to a network that makes the function discoverable, registerable, remotely controllable by other devices in the network"@en ; -- GitLab