Merge branch 'main' of https://github.com/D-WIS/DDHub-Semantic-Intero…

…perability
D-WIS · Oct 19, 2024 · 3a7cf57 · 3a7cf57
2 parents 5449541 + d5c7be7
commit 3a7cf57
Show file tree

Hide file tree

Showing 35 changed files with 8 additions and 8 deletions.
diff --git a/docs/vocabulary_development/auto-generated/json/DWISVocabulary.json b/docs/vocabulary_development/auto-generated/json/DWISVocabulary.json
diff --git a/docs/vocabulary_development/auto-generated/md/DWISvocabulary.md b/docs/vocabulary_development/auto-generated/md/DWISvocabulary.md
@@ -50687,7 +50687,7 @@ WHERE {
 ## ImplementsObjective <!-- VERB -->
 - Display name: Implements Objective
 - Parent verb: [DWISVerb](#DWISVerb)
-- Subject class: [ControlFunction](#ControlFunction)
+- Subject class: [ControllerFunction](#ControllerFunction)
 - Object class: [DrillingObjective](#DrillingObjective)
 - Definition set: DrillingObjective
 - Description: 

diff --git a/.../vocabulary_development/auto-generated/md/definition-files/DrillingObjective.md b/.../vocabulary_development/auto-generated/md/definition-files/DrillingObjective.md
@@ -537,7 +537,7 @@ Here is a graph representing the relations that can be made with the verbs defin
 ```mermaid
 erDiagram
 DrillingDataPoint ||--o{ DrillingObjective : IsRelatedToDrillingObjective
-ControlFunction ||--o{ DrillingObjective : ImplementsObjective
+ControllerFunction ||--o{ DrillingObjective : ImplementsObjective
 ```
 ## IsRelatedToDrillingObjective <!-- VERB -->
 - Display name: Is Related To Drilling Objective
@@ -659,7 +659,7 @@ WHERE {
 ## ImplementsObjective <!-- VERB -->
 - Display name: Implements Objective
 - Parent verb: [DWISVerb](./DWISSemantics.md#DWISVerb)
-- Subject class: [ControlFunction](./.md#ControlFunction)
+- Subject class: [ControllerFunction](./ADCS.md#ControllerFunction)
 - Object class: [DrillingObjective](./DrillingObjective.md#DrillingObjective)
 - Definition set: DrillingObjective
 - Description: 

diff --git a/docs/vocabulary_development/auto-generated/rdf/DWISVocabulary.nt b/docs/vocabulary_development/auto-generated/rdf/DWISVocabulary.nt
@@ -6388,7 +6388,7 @@
 <http://ddhub.no/IsRelatedToDrillingObjective> <http://www.w3.org/2000/01/rdf-schema#range> <http://ddhub.no/DrillingObjective> .
 <http://ddhub.no/IsRelatedToDrillingObjective> <http://www.w3.org/2000/01/rdf-schema#subPropertyOf> <http://ddhub.no/DWISVerb> .
 <http://ddhub.no/ImplementsObjective> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> .
-<http://ddhub.no/ImplementsObjective> <http://www.w3.org/2000/01/rdf-schema#domain> <http://ddhub.no/ControlFunction> .
+<http://ddhub.no/ImplementsObjective> <http://www.w3.org/2000/01/rdf-schema#domain> <http://ddhub.no/ControllerFunction> .
 <http://ddhub.no/ImplementsObjective> <http://www.w3.org/2000/01/rdf-schema#range> <http://ddhub.no/DrillingObjective> .
 <http://ddhub.no/ImplementsObjective> <http://www.w3.org/2000/01/rdf-schema#subPropertyOf> <http://ddhub.no/DWISVerb> .
 <http://ddhub.no/IsRelatedToDrillingProcedure> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#ObjectProperty> .

diff --git a/docs/vocabulary_development/auto-generated/rdf/DWISVocabulary.ttl b/docs/vocabulary_development/auto-generated/rdf/DWISVocabulary.ttl
@@ -5252,7 +5252,7 @@ ddhub:ImplementsLimit a owl:ObjectProperty;
 ddhub:ImplementsObjective a owl:ObjectProperty; 
                           rdfs:comment """This Verb is used to indicate that a control function implements a drilling objective.
 """@EN; 
-                          rdfs:domain ddhub:ControlFunction; 
+                          rdfs:domain ddhub:ControllerFunction; 
                           rdfs:range ddhub:DrillingObjective; 
                           rdfs:subPropertyOf ddhub:DWISVerb. 
 ddhub:ImplementsProcedure a owl:ObjectProperty; 

diff --git a/docs/vocabulary_development/auto-generated/rdf/DWISVocabulary.xml b/docs/vocabulary_development/auto-generated/rdf/DWISVocabulary.xml
@@ -19111,7 +19111,7 @@ to another.
   </rdf:Description>
   <rdf:Description rdf:about="http://ddhub.no/ImplementsObjective">
     <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#ObjectProperty" />
-    <rdfs:domain rdf:resource="http://ddhub.no/ControlFunction" />
+    <rdfs:domain rdf:resource="http://ddhub.no/ControllerFunction" />
     <rdfs:range rdf:resource="http://ddhub.no/DrillingObjective" />
     <rdfs:subPropertyOf rdf:resource="http://ddhub.no/DWISVerb" />
     <rdfs:comment xml:lang="EN">This Verb is used to indicate that a control function implements a drilling objective.

diff --git a/docs/vocabulary_development/diagrams/generated/ADCS.png b/docs/vocabulary_development/diagrams/generated/ADCS.png
diff --git a/docs/vocabulary_development/diagrams/generated/AdvisorySystemAdvice.png b/docs/vocabulary_development/diagrams/generated/AdvisorySystemAdvice.png
diff --git a/docs/vocabulary_development/diagrams/generated/ContextualData.png b/docs/vocabulary_development/diagrams/generated/ContextualData.png
diff --git a/docs/vocabulary_development/diagrams/generated/DataDependencies.png b/docs/vocabulary_development/diagrams/generated/DataDependencies.png
diff --git a/docs/vocabulary_development/diagrams/generated/DataFlow.png b/docs/vocabulary_development/diagrams/generated/DataFlow.png
diff --git a/docs/vocabulary_development/diagrams/generated/DataProviders.png b/docs/vocabulary_development/diagrams/generated/DataProviders.png
diff --git a/docs/vocabulary_development/diagrams/generated/DataTransmission.png b/docs/vocabulary_development/diagrams/generated/DataTransmission.png
diff --git a/docs/vocabulary_development/diagrams/generated/DataValidity.png b/docs/vocabulary_development/diagrams/generated/DataValidity.png
diff --git a/docs/vocabulary_development/diagrams/generated/DrillingDataSemantics.png b/docs/vocabulary_development/diagrams/generated/DrillingDataSemantics.png
diff --git a/docs/vocabulary_development/diagrams/generated/DrillingEquipment.png b/docs/vocabulary_development/diagrams/generated/DrillingEquipment.png
diff --git a/docs/vocabulary_development/diagrams/generated/DrillingIncident.png b/docs/vocabulary_development/diagrams/generated/DrillingIncident.png
diff --git a/docs/vocabulary_development/diagrams/generated/DrillingLimit.png b/docs/vocabulary_development/diagrams/generated/DrillingLimit.png
diff --git a/docs/vocabulary_development/diagrams/generated/DrillingObjective.png b/docs/vocabulary_development/diagrams/generated/DrillingObjective.png
diff --git a/docs/vocabulary_development/diagrams/generated/DrillingProcedure.png b/docs/vocabulary_development/diagrams/generated/DrillingProcedure.png
diff --git a/docs/vocabulary_development/diagrams/generated/EndPoints.png b/docs/vocabulary_development/diagrams/generated/EndPoints.png
diff --git a/docs/vocabulary_development/diagrams/generated/Hydraulics.png b/docs/vocabulary_development/diagrams/generated/Hydraulics.png
diff --git a/docs/vocabulary_development/diagrams/generated/MeasurableQuantityTypes.png b/docs/vocabulary_development/diagrams/generated/MeasurableQuantityTypes.png
diff --git a/docs/vocabulary_development/diagrams/generated/MechanicalModel.png b/docs/vocabulary_development/diagrams/generated/MechanicalModel.png
diff --git a/docs/vocabulary_development/diagrams/generated/Mechanics.png b/docs/vocabulary_development/diagrams/generated/Mechanics.png
diff --git a/docs/vocabulary_development/diagrams/generated/Model.png b/docs/vocabulary_development/diagrams/generated/Model.png
diff --git a/docs/vocabulary_development/diagrams/generated/PhysicalLocation.png b/docs/vocabulary_development/diagrams/generated/PhysicalLocation.png
diff --git a/docs/vocabulary_development/diagrams/generated/Quantities.png b/docs/vocabulary_development/diagrams/generated/Quantities.png
diff --git a/docs/vocabulary_development/diagrams/generated/QuantityTypes.png b/docs/vocabulary_development/diagrams/generated/QuantityTypes.png
diff --git a/docs/vocabulary_development/diagrams/generated/SignalPrototypes.png b/docs/vocabulary_development/diagrams/generated/SignalPrototypes.png
diff --git a/docs/vocabulary_development/diagrams/generated/TimeManagement.png b/docs/vocabulary_development/diagrams/generated/TimeManagement.png
diff --git a/docs/vocabulary_development/diagrams/generated/Uncertainty.png b/docs/vocabulary_development/diagrams/generated/Uncertainty.png
diff --git a/docs/vocabulary_development/diagrams/generated/UnitTypes.png b/docs/vocabulary_development/diagrams/generated/UnitTypes.png
diff --git a/docs/vocabulary_development/diagrams/generated/everything.png b/docs/vocabulary_development/diagrams/generated/everything.png
diff --git a/src/DWIS-Vocabulary/DWIS-Vocabulary/DWIS.Vocabulary.Standard/Properties/DWISVocabulary.json b/src/DWIS-Vocabulary/DWIS-Vocabulary/DWIS.Vocabulary.Standard/Properties/DWISVocabulary.json