Update Turnstile for ontology-review changes

ge-high-assurance · Jan 5, 2021 · e142740 · e142740
1 parent 9af9030
commit e142740
Show file tree

Hide file tree

Showing 13 changed files with 119 additions and 132 deletions.
diff --git a/RACK-Ontology/OwlModels/GeneratePropInfoCSV.owl b/RACK-Ontology/OwlModels/GeneratePropInfoCSV.owl
@@ -1,7 +1,7 @@
 <rdf:RDF
     xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:Ag="http://arcos.rack/AGENTS#"
     xmlns:builtinfunctions="http://sadl.org/builtinfunctions#"
-    xmlns:AGENTS="http://arcos.rack/AGENTS#"
     xmlns:CONFIDENCE="http://arcos.rack/CONFIDENCE#"
     xmlns:Pr="http://arcos.rack/PROCESS#"
     xmlns:sadlimplicitmodel="http://sadl.org/sadlimplicitmodel#"

diff --git a/RACK-Ontology/OwlModels/SACM-S.owl b/RACK-Ontology/OwlModels/SACM-S.owl
@@ -18,12 +18,12 @@
     <rdfs:comment xml:lang="en">This ontology was created from a SADL file 'SACM-S.sadl' and should not be directly edited.</rdfs:comment>
   </owl:Ontology>
   <owl:Class rdf:ID="ASSERTED_CONTEXT">
-    <rdfs:comment xml:lang="en">Asserted Context can be used to declare that the artifact cited by an ArtifactReference(s) provides the context for the&#xD;
+    <rdfs:comment xml:lang="en">Asserted Context can be used to declare that the artifact cited by an ArtifactReference(s) provides the context for the
 interpretation and scoping of a Claim or ArgumentReasoning element.</rdfs:comment>
     <rdfs:subClassOf rdf:resource="PROV-S#ENTITY"/>
   </owl:Class>
   <owl:Class rdf:ID="ASSERTED_INFERENCE">
-    <rdfs:comment xml:lang="en">Asserted Inference association records the inference that a user declares to exist between one or more Assertion (premise) and&#xD;
+    <rdfs:comment xml:lang="en">Asserted Inference association records the inference that a user declares to exist between one or more Assertion (premise) and
 another Assertion (conclusion).</rdfs:comment>
     <rdfs:subClassOf rdf:resource="PROV-S#ENTITY"/>
   </owl:Class>
@@ -32,7 +32,7 @@ another Assertion (conclusion).</rdfs:comment>
     <rdfs:subClassOf rdf:resource="PROV-S#ENTITY"/>
   </owl:Class>
   <owl:Class rdf:ID="ARGUMENT_PACKAGE">
-    <rdfs:comment xml:lang="en">Argument Package is the containing element for a structured argument represented using the SACM Argumentation&#xD;
+    <rdfs:comment xml:lang="en">Argument Package is the containing element for a structured argument represented using the SACM Argumentation
 Metamodel.</rdfs:comment>
     <rdfs:subClassOf rdf:resource="PROV-S#ENTITY"/>
   </owl:Class>

diff --git a/RACK-Ontology/OwlModels/SadlImplicitModel.owl b/RACK-Ontology/OwlModels/SadlImplicitModel.owl
@@ -53,6 +53,21 @@
       </owl:Restriction>
     </rdfs:subClassOf>
   </owl:Class>
+  <owl:Class rdf:nodeID="A0">
+    <rdfs:subClassOf>
+      <owl:Restriction>
+        <owl:allValuesFrom rdf:nodeID="A0"/>
+        <owl:onProperty rdf:resource="sadllistmodel#rest"/>
+      </owl:Restriction>
+    </rdfs:subClassOf>
+    <rdfs:subClassOf>
+      <owl:Restriction>
+        <owl:allValuesFrom rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+        <owl:onProperty rdf:resource="sadllistmodel#first"/>
+      </owl:Restriction>
+    </rdfs:subClassOf>
+    <rdfs:subClassOf rdf:resource="sadllistmodel#List"/>
+  </owl:Class>
   <owl:Class rdf:ID="FunctionPattern">
     <rdfs:subClassOf>
       <owl:Restriction>
@@ -76,25 +91,7 @@
       <owl:Class rdf:ID="GraphPattern"/>
     </rdfs:subClassOf>
   </owl:Class>
-  <owl:Class rdf:nodeID="A0">
-    <rdfs:subClassOf>
-      <owl:Restriction>
-        <owl:allValuesFrom rdf:nodeID="A0"/>
-        <owl:onProperty rdf:resource="sadllistmodel#rest"/>
-      </owl:Restriction>
-    </rdfs:subClassOf>
-    <rdfs:subClassOf>
-      <owl:Restriction>
-        <owl:allValuesFrom rdf:resource="#anyDataType"/>
-        <owl:allValuesFrom>
-          <owl:Class rdf:ID="DataDescriptor"/>
-        </owl:allValuesFrom>
-        <owl:onProperty rdf:resource="sadllistmodel#first"/>
-      </owl:Restriction>
-    </rdfs:subClassOf>
-    <rdfs:subClassOf rdf:resource="sadllistmodel#List"/>
-  </owl:Class>
-  <owl:Class rdf:about="#DataDescriptor">
+  <owl:Class rdf:ID="DataDescriptor">
     <rdfs:subClassOf>
       <owl:Restriction>
         <owl:maxCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
@@ -150,7 +147,22 @@
     </rdfs:subClassOf>
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:allValuesFrom rdf:resource="#anyDataType"/>
+        <owl:allValuesFrom rdf:resource="#DataDescriptor"/>
+        <owl:onProperty rdf:resource="sadllistmodel#first"/>
+      </owl:Restriction>
+    </rdfs:subClassOf>
+    <rdfs:subClassOf rdf:resource="sadllistmodel#List"/>
+  </owl:Class>
+  <owl:Class rdf:nodeID="A2">
+    <rdfs:subClassOf>
+      <owl:Restriction>
+        <owl:allValuesFrom rdf:nodeID="A2"/>
+        <owl:onProperty rdf:resource="sadllistmodel#rest"/>
+      </owl:Restriction>
+    </rdfs:subClassOf>
+    <rdfs:subClassOf>
+      <owl:Restriction>
+        <owl:allValuesFrom rdf:resource="#GraphPattern"/>
         <owl:onProperty rdf:resource="sadllistmodel#first"/>
       </owl:Restriction>
     </rdfs:subClassOf>
@@ -190,25 +202,22 @@
   </owl:Class>
   <owl:Class rdf:ID="GPAtom"/>
   <owl:Class rdf:ID="Language"/>
-  <owl:Class rdf:nodeID="A2">
+  <owl:Class rdf:nodeID="A3">
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:allValuesFrom rdf:nodeID="A2"/>
+        <owl:allValuesFrom rdf:nodeID="A3"/>
         <owl:onProperty rdf:resource="sadllistmodel#rest"/>
       </owl:Restriction>
     </rdfs:subClassOf>
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:allValuesFrom>
-          <owl:Class rdf:ID="DataTableRow"/>
-        </owl:allValuesFrom>
-
+        <owl:allValuesFrom rdf:resource="#anyDataType"/>
         <owl:onProperty rdf:resource="sadllistmodel#first"/>
       </owl:Restriction>
     </rdfs:subClassOf>
     <rdfs:subClassOf rdf:resource="sadllistmodel#List"/>
   </owl:Class>
-  <owl:Class rdf:about="#DataTableRow">
+  <owl:Class rdf:ID="DataTableRow">
     <rdfs:subClassOf>
       <owl:Restriction>
         <owl:cardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
@@ -220,22 +229,6 @@
     </rdfs:subClassOf>
   </owl:Class>
   <owl:Class rdf:ID="ScientificConcept"/>
-  <owl:Class rdf:nodeID="A3">
-    <rdfs:subClassOf>
-      <owl:Restriction>
-        <owl:allValuesFrom rdf:nodeID="A3"/>
-        <owl:onProperty rdf:resource="sadllistmodel#rest"/>
-      </owl:Restriction>
-    </rdfs:subClassOf>
-    <rdfs:subClassOf>
-      <owl:Restriction>
-        <owl:allValuesFrom rdf:resource="#GPAtom"/>
-        <owl:onProperty rdf:resource="sadllistmodel#first"/>
-      </owl:Restriction>
-    </rdfs:subClassOf>
-    <rdfs:subClassOf rdf:resource="sadllistmodel#List"/>
-  </owl:Class>
-  <owl:Class rdf:ID="ScientificConcept"/>
   <owl:Class rdf:ID="SemanticType">
     <rdfs:subClassOf>
       <owl:Restriction>
@@ -262,21 +255,6 @@
       </owl:Restriction>
     </rdfs:subClassOf>
   </owl:Class>
-  <owl:Class rdf:nodeID="A4">
-    <rdfs:subClassOf>
-      <owl:Restriction>
-        <owl:allValuesFrom rdf:nodeID="A4"/>
-        <owl:onProperty rdf:resource="sadllistmodel#rest"/>
-      </owl:Restriction>
-    </rdfs:subClassOf>
-    <rdfs:subClassOf>
-      <owl:Restriction>
-        <owl:allValuesFrom rdf:resource="#GPAtom"/>
-        <owl:onProperty rdf:resource="sadllistmodel#first"/>
-      </owl:Restriction>
-    </rdfs:subClassOf>
-    <rdfs:subClassOf rdf:resource="sadllistmodel#List"/>
-  </owl:Class>
   <owl:Class rdf:ID="Script">
     <rdfs:subClassOf>
       <owl:Restriction>
@@ -300,16 +278,16 @@
   <owl:Class rdf:ID="UnittedQuantity">
     <rdfs:subClassOf rdf:resource="#ScientificConcept"/>
   </owl:Class>
-  <owl:Class rdf:nodeID="A5">
+  <owl:Class rdf:nodeID="A4">
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:allValuesFrom rdf:nodeID="A5"/>
+        <owl:allValuesFrom rdf:nodeID="A4"/>
         <owl:onProperty rdf:resource="sadllistmodel#rest"/>
       </owl:Restriction>
     </rdfs:subClassOf>
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:allValuesFrom rdf:resource="#DataDescriptor"/>
+        <owl:allValuesFrom rdf:resource="#DataTableRow"/>
         <owl:onProperty rdf:resource="sadllistmodel#first"/>
       </owl:Restriction>
     </rdfs:subClassOf>
@@ -330,6 +308,21 @@
     </rdfs:subClassOf>
     <rdfs:subClassOf rdf:resource="#GPAtom"/>
   </owl:Class>
+  <owl:Class rdf:nodeID="A5">
+    <rdfs:subClassOf>
+      <owl:Restriction>
+        <owl:allValuesFrom rdf:nodeID="A5"/>
+        <owl:onProperty rdf:resource="sadllistmodel#rest"/>
+      </owl:Restriction>
+    </rdfs:subClassOf>
+    <rdfs:subClassOf>
+      <owl:Restriction>
+        <owl:allValuesFrom rdf:resource="#GPAtom"/>
+        <owl:onProperty rdf:resource="sadllistmodel#first"/>
+      </owl:Restriction>
+    </rdfs:subClassOf>
+    <rdfs:subClassOf rdf:resource="sadllistmodel#List"/>
+  </owl:Class>
   <owl:Class rdf:ID="GPResource">
     <rdfs:subClassOf rdf:resource="#GPAtom"/>
   </owl:Class>
@@ -352,24 +345,24 @@
   <owl:Class rdf:ID="Rule"/>
   <owl:Class rdf:ID="NamedQuery"/>
   <owl:ObjectProperty rdf:about="#arguments">
-    <rdfs:range rdf:nodeID="A0"/>
+    <rdfs:range rdf:nodeID="A1"/>
     <rdfs:domain rdf:resource="#Equation"/>
   </owl:ObjectProperty>
   <owl:ObjectProperty rdf:about="#specifiedUnits">
     <rdfs:domain rdf:resource="#DataDescriptor"/>
     <rdfs:comment xml:lang="en">the array of possible units</rdfs:comment>
-    <rdfs:range rdf:nodeID="A5"/>
+    <rdfs:range rdf:nodeID="A0"/>
   </owl:ObjectProperty>
   <owl:ObjectProperty rdf:ID="gpObject">
     <rdfs:domain rdf:resource="#TriplePattern"/>
   </owl:ObjectProperty>
   <owl:ObjectProperty rdf:about="#dataContent">
     <rdfs:domain rdf:resource="#DataTable"/>
-    <rdfs:range rdf:nodeID="A2"/>
+    <rdfs:range rdf:nodeID="A4"/>
   </owl:ObjectProperty>
   <owl:ObjectProperty rdf:about="#columnDescriptors">
     <rdfs:domain rdf:resource="#DataTable"/>
-    <rdfs:range rdf:nodeID="A0"/>
+    <rdfs:range rdf:nodeID="A1"/>
   </owl:ObjectProperty>
   <owl:ObjectProperty rdf:ID="expression">
     <rdfs:domain rdf:resource="#Equation"/>
@@ -380,19 +373,19 @@
   </owl:ObjectProperty>
   <owl:ObjectProperty rdf:about="#rowValues">
     <rdfs:domain rdf:resource="#DataTableRow"/>
-    <rdfs:range rdf:nodeID="A1"/>
+    <rdfs:range rdf:nodeID="A3"/>
   </owl:ObjectProperty>
   <owl:ObjectProperty rdf:about="#returnTypes">
-    <rdfs:range rdf:nodeID="A0"/>
+    <rdfs:range rdf:nodeID="A1"/>
     <rdfs:domain rdf:resource="#Equation"/>
   </owl:ObjectProperty>
   <owl:ObjectProperty rdf:about="#constraints">
     <rdfs:domain rdf:resource="#SemanticConstraint"/>
-    <rdfs:range rdf:nodeID="A3"/>
+    <rdfs:range rdf:nodeID="A2"/>
   </owl:ObjectProperty>
   <owl:ObjectProperty rdf:about="#argValues">
     <rdfs:comment xml:lang="en">values of arguments to the built-in</rdfs:comment>
-    <rdfs:range rdf:nodeID="A4"/>
+    <rdfs:range rdf:nodeID="A5"/>
     <rdfs:domain rdf:resource="#FunctionPattern"/>
   </owl:ObjectProperty>
   <owl:ObjectProperty rdf:about="#builtin">
@@ -411,7 +404,7 @@
     <rdfs:range rdf:resource="#AugmentedType"/>
   </owl:ObjectProperty>
   <owl:ObjectProperty rdf:about="#augTypeUnits">
-    <rdfs:range rdf:nodeID="A5"/>
+    <rdfs:range rdf:nodeID="A0"/>
     <rdfs:domain rdf:resource="#AugmentedType"/>
   </owl:ObjectProperty>
   <owl:ObjectProperty rdf:about="#language">

diff --git a/Turnstile-Ontology/02-Software/01-Requirements/CounterApplicationRequirementSpec.sadl b/Turnstile-Ontology/02-Software/01-Requirements/CounterApplicationRequirementSpec.sadl
@@ -16,7 +16,7 @@ import "http://Turnstile/HazardAssessment".
 
 JohnDoe is a Engineer
 	has identifier "125569538"
-	has AGENTS:name "Doe, John"
+	has title "Doe, John"
 	has emailAddress "john.doe@ge.com"
 	has employedBy General_Electric.
 

diff --git a/Turnstile-Ontology/02-Software/02-Design/CounterApplicationDesignDescription.sadl b/Turnstile-Ontology/02-Software/02-Design/CounterApplicationDesignDescription.sadl
@@ -15,7 +15,7 @@ import "http://Turnstile/CounterApplicationRequirementSpec".
 
 JaneDoe is a Engineer
 	has identifier "2125895152"
-	has AGENTS:name "Doe, Jane"
+	has title "Doe, Jane"
 	has emailAddress "jane.doe@ge.com"
 	has employedBy General_Electric.
 

diff --git a/Turnstile-Ontology/03-Verification/01-Reviews/CounterApplicationReviews.sadl b/Turnstile-Ontology/03-Verification/01-Reviews/CounterApplicationReviews.sadl
@@ -15,7 +15,7 @@
 
  JohnQ is an Engineer
 	has identifier "259863025"
-	has AGENTS:name "Public, John"
+	has title "Public, John"
 	has emailAddress "john.public@ge.com"
 	has employedBy General_Electric.
 

diff --git a/Turnstile-Ontology/99-Utils/NodeGroups/Ingest-SoftwareComponentTestResult.json b/Turnstile-Ontology/99-Utils/NodeGroups/Ingest-SoftwareComponentTestResult.json
@@ -140,8 +140,8 @@
 							false
 						],
 						"KeyName": "confirms",
-						"ValueType": "ENTITY",
-						"UriValueType": "http://arcos.rack/PROV-S#ENTITY",
+						"ValueType": "TEST",
+						"UriValueType": "http://arcos.rack/TESTING#TEST",
 						"ConnectBy": "confirms",
 						"Connected": true,
 						"UriConnectBy": "http://arcos.rack/TESTING#confirms"
@@ -323,4 +323,4 @@
 			}
 		]
 	}
-}
+}
diff --git a/Turnstile-Ontology/99-Utils/NodeGroups/Ingest-SoftwareUnitTestResult.json b/Turnstile-Ontology/99-Utils/NodeGroups/Ingest-SoftwareUnitTestResult.json
@@ -140,8 +140,8 @@
 							false
 						],
 						"KeyName": "confirms",
-						"ValueType": "ENTITY",
-						"UriValueType": "http://arcos.rack/PROV-S#ENTITY",
+						"ValueType": "TEST",
+						"UriValueType": "http://arcos.rack/TESTING#TEST",
 						"ConnectBy": "confirms",
 						"Connected": true,
 						"UriConnectBy": "http://arcos.rack/TESTING#confirms"
@@ -323,4 +323,4 @@
 			}
 		]
 	}
-}
+}
diff --git a/Turnstile-Ontology/OwlModels/CounterApplicationDesignDescription.owl b/Turnstile-Ontology/OwlModels/CounterApplicationDesignDescription.owl
@@ -31,7 +31,7 @@
           <j.1:Engineer rdf:ID="JaneDoe">
             <j.0:employedBy rdf:resource="DevelopmentPlanData#General_Electric"/>
             <j.0:emailAddress>jane.doe@ge.com</j.0:emailAddress>
-            <j.0:name>Doe, Jane</j.0:name>
+            <j.3:title>Doe, Jane</j.3:title>
             <j.3:identifier>2125895152</j.3:identifier>
           </j.1:Engineer>
         </j.2:author>

diff --git a/Turnstile-Ontology/OwlModels/CounterApplicationRequirementSpec.owl b/Turnstile-Ontology/OwlModels/CounterApplicationRequirementSpec.owl
@@ -32,7 +32,7 @@
           <j.1:Engineer rdf:ID="JohnDoe">
             <j.0:employedBy rdf:resource="DevelopmentPlanData#General_Electric"/>
             <j.0:emailAddress>john.doe@ge.com</j.0:emailAddress>
-            <j.0:name>Doe, John</j.0:name>
+            <j.3:title>Doe, John</j.3:title>
             <j.3:identifier>125569538</j.3:identifier>
           </j.1:Engineer>
         </j.2:author>

diff --git a/Turnstile-Ontology/OwlModels/CounterApplicationReviews.owl b/Turnstile-Ontology/OwlModels/CounterApplicationReviews.owl
@@ -33,7 +33,7 @@
           <j.1:Engineer rdf:ID="JohnQ">
             <j.0:employedBy rdf:resource="DevelopmentPlanData#General_Electric"/>
             <j.0:emailAddress>john.public@ge.com</j.0:emailAddress>
-            <j.0:name>Public, John</j.0:name>
+            <j.3:title>Public, John</j.3:title>
             <j.3:identifier>259863025</j.3:identifier>
           </j.1:Engineer>
         </j.2:reviewer>