Uncomment inverses and fix nodegroups

ge-high-assurance · Jan 6, 2021 · 404e3e7 · 404e3e7
1 parent 7d88c02
commit 404e3e7
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 29 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/SYSTEM.owl b/RACK-Ontology/OwlModels/SYSTEM.owl
@@ -90,14 +90,17 @@
   </owl:ObjectProperty>
   <owl:ObjectProperty rdf:ID="source">
     <rdfs:subPropertyOf rdf:resource="PROV-S#wasImpactedBy"/>
+    <owl:inverseOf>
+      <owl:ObjectProperty rdf:ID="destination"/>
+    </owl:inverseOf>
     <rdfs:comment xml:lang="en">SYSTEM that provides what the INTERFACE offers</rdfs:comment>
     <rdfs:range rdf:resource="#SYSTEM"/>
     <rdfs:domain rdf:resource="#INTERFACE"/>
   </owl:ObjectProperty>
   <owl:ObjectProperty rdf:about="#producedBy">
     <rdfs:subPropertyOf rdf:resource="PROV-S#wasGeneratedBy"/>
     <rdfs:comment xml:lang="en">ACTIVITY(s) participating in developing this SYSTEM</rdfs:comment>
-    <rdfs:range rdf:resource="#SYSTEM_DEVELOPMENT"/>
+    <rdfs:range rdf:resource="PROV-S#ACTIVITY"/>
     <rdfs:domain rdf:resource="#SYSTEM"/>
   </owl:ObjectProperty>
   <owl:ObjectProperty rdf:about="#parentFunction">
@@ -121,8 +124,9 @@
     <rdfs:range rdf:resource="PROV-S#ACTIVITY"/>
     <rdfs:domain rdf:resource="#INTERFACE"/>
   </owl:ObjectProperty>
-  <owl:ObjectProperty rdf:ID="destination">
+  <owl:ObjectProperty rdf:about="#destination">
     <rdfs:subPropertyOf rdf:resource="PROV-S#wasImpactedBy"/>
+    <owl:inverseOf rdf:resource="#source"/>
     <rdfs:comment xml:lang="en">SYSTEM that requires what the INTERFACE offers</rdfs:comment>
     <rdfs:range rdf:resource="#SYSTEM"/>
     <rdfs:domain rdf:resource="#INTERFACE"/>

diff --git a/RACK-Ontology/ontology/SYSTEM.sadl b/RACK-Ontology/ontology/SYSTEM.sadl
@@ -27,7 +27,7 @@ SYSTEM
 
 	partOf (note "Used to define a relationship to a higher level system") describes SYSTEM with values of type SYSTEM.
 
-	producedBy (note "ACTIVITY(s) participating in developing this SYSTEM") describes SYSTEM with values of type SYSTEM_DEVELOPMENT.
+	producedBy (note "ACTIVITY(s) participating in developing this SYSTEM") describes SYSTEM with values of type ACTIVITY.
 	producedBy describes SYSTEM with at most 1 value.
 	producedBy is a type of wasGeneratedBy.
 
@@ -46,11 +46,11 @@ INTERFACE
 	commodity describes INTERFACE with at most 1 value.
 
 	source (note "SYSTEM that provides what the INTERFACE offers") describes INTERFACE with values of type SYSTEM.
-	// source is the inverse of sink.
+	source is the inverse of destination.
 	source is a type of wasImpactedBy.
 
 	destination (note "SYSTEM that requires what the INTERFACE offers") describes INTERFACE with values of type SYSTEM.
-	// sink is the inverse of source.
+	destination is the inverse of source.
 	destination is a type of wasImpactedBy.
 
 	identifiedBy (note "ACTIVITY out of which this INTERFACE was identified") describes INTERFACE with values of type ACTIVITY.

diff --git a/Turnstile-Ontology/99-Utils/NodeGroups/Ingest-SoftwareThread.json b/Turnstile-Ontology/99-Utils/NodeGroups/Ingest-SoftwareThread.json
@@ -133,8 +133,8 @@
 							false
 						],
 						"KeyName": "partOf",
-						"ValueType": "ENTITY",
-						"UriValueType": "http://arcos.rack/PROV-S#ENTITY",
+						"ValueType": "SYSTEM",
+						"UriValueType": "http://arcos.rack/SYSTEM#SYSTEM",
 						"ConnectBy": "partOf",
 						"Connected": true,
 						"UriConnectBy": "http://arcos.rack/SYSTEM#partOf"
@@ -250,4 +250,4 @@
 			}
 		]
 	}
-}
+}
diff --git a/Turnstile-Ontology/99-Utils/NodeGroups/Ingest-SystemComponent.json b/Turnstile-Ontology/99-Utils/NodeGroups/Ingest-SystemComponent.json
@@ -87,8 +87,8 @@
 							false
 						],
 						"KeyName": "partOf",
-						"ValueType": "ENTITY",
-						"UriValueType": "http://arcos.rack/PROV-S#ENTITY",
+						"ValueType": "SYSTEM",
+						"UriValueType": "http://arcos.rack/SYSTEM#SYSTEM",
 						"ConnectBy": "partOf",
 						"Connected": true,
 						"UriConnectBy": "http://arcos.rack/SYSTEM#partOf"
@@ -178,4 +178,4 @@
 			}
 		]
 	}
-}
+}
diff --git a/Turnstile-Ontology/99-Utils/NodeGroups/Ingest-SystemInterfaceDefinition.json b/Turnstile-Ontology/99-Utils/NodeGroups/Ingest-SystemInterfaceDefinition.json
@@ -112,8 +112,8 @@
 							false
 						],
 						"KeyName": "destination",
-						"ValueType": "ENTITY",
-						"UriValueType": "http://arcos.rack/PROV-S#ENTITY",
+						"ValueType": "SYSTEM",
+						"UriValueType": "http://arcos.rack/SYSTEM#SYSTEM",
 						"ConnectBy": "destination",
 						"Connected": true,
 						"UriConnectBy": "http://arcos.rack/SYSTEM#destination"
@@ -132,8 +132,8 @@
 							false
 						],
 						"KeyName": "source",
-						"ValueType": "ENTITY",
-						"UriValueType": "http://arcos.rack/PROV-S#ENTITY",
+						"ValueType": "SYSTEM",
+						"UriValueType": "http://arcos.rack/SYSTEM#SYSTEM",
 						"ConnectBy": "source",
 						"Connected": true,
 						"UriConnectBy": "http://arcos.rack/SYSTEM#source"
@@ -249,4 +249,4 @@
 			}
 		]
 	}
-}
+}
diff --git a/Turnstile-Ontology/OwlModels/DevelopmentPlan.owl b/Turnstile-Ontology/OwlModels/DevelopmentPlan.owl
@@ -1,23 +1,12 @@
 <rdf:RDF
     xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
     xmlns:builtinfunctions="http://sadl.org/builtinfunctions#"
-    xmlns:AGENTS="http://arcos.rack/AGENTS#"
-    xmlns:Pr="http://arcos.rack/PROCESS#"
+    xmlns:owl="http://www.w3.org/2002/07/owl#"
     xmlns:sadlimplicitmodel="http://sadl.org/sadlimplicitmodel#"
     xmlns:trnstldp="http://Turnstile/DevelopmentPlan#"
     xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-    xmlns:Rv="http://arcos.rack/REVIEW#"
-    xmlns:D="http://arcos.rack/DOCUMENT#"
     xmlns:sadlbasemodel="http://sadl.org/sadlbasemodel#"
-    xmlns:Rq="http://arcos.rack/REQUIREMENTS#"
-    xmlns:H="http://arcos.rack/HAZARD#"
-    xmlns:sw="http://arcos.rack/SOFTWARE#"
-    xmlns:A="http://arcos.rack/ANALYSIS#"
-    xmlns:sys="http://arcos.rack/SYSTEM#"
-    xmlns:owl="http://www.w3.org/2002/07/owl#"
-    xmlns:DO-178C="http://common/DO-178C#"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
-    xmlns:tst="http://arcos.rack/TESTING#"
   xml:base="http://Turnstile/DevelopmentPlan">
   <owl:Ontology rdf:about="">
     <owl:imports rdf:resource="http://arcos.rack/REVIEW"/>