Restore SYSTEM#function

ge-high-assurance · Feb 3, 2021 · 49db218 · 49db218
1 parent 6ee3dd1
commit 49db218
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 17 deletions.
diff --git a/RACK-Ontology/OwlModels/SYSTEM.owl b/RACK-Ontology/OwlModels/SYSTEM.owl
@@ -40,15 +40,6 @@
     <rdfs:subClassOf rdf:resource="PROV-S#ACTIVITY"/>
   </owl:Class>
   <owl:Class rdf:ID="SYSTEM">
-    <rdfs:subClassOf>
-      <owl:Restriction>
-        <owl:maxCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
-        >1</owl:maxCardinality>
-        <owl:onProperty>
-          <owl:DatatypeProperty rdf:ID="functionalityOverview"/>
-        </owl:onProperty>
-      </owl:Restriction>
-    </rdfs:subClassOf>
     <rdfs:subClassOf>
       <owl:Restriction>
         <owl:maxCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
@@ -88,6 +79,12 @@
     <rdfs:range rdf:resource="#SYSTEM"/>
     <rdfs:domain rdf:resource="#SYSTEM"/>
   </owl:ObjectProperty>
+  <owl:ObjectProperty rdf:ID="function">
+    <rdfs:subPropertyOf rdf:resource="PROV-S#wasImpactedBy"/>
+    <rdfs:comment xml:lang="en">functionality / capability of a SYSTEM</rdfs:comment>
+    <rdfs:range rdf:resource="#FUNCTION"/>
+    <rdfs:domain rdf:resource="#SYSTEM"/>
+  </owl:ObjectProperty>
   <owl:ObjectProperty rdf:ID="source">
     <rdfs:subPropertyOf rdf:resource="PROV-S#wasImpactedBy"/>
     <owl:inverseOf rdf:resource="#provides"/>
@@ -129,11 +126,6 @@
     <rdfs:range rdf:resource="#SYSTEM"/>
     <rdfs:domain rdf:resource="#INTERFACE"/>
   </owl:ObjectProperty>
-  <owl:DatatypeProperty rdf:about="#functionalityOverview">
-    <rdfs:comment xml:lang="en">functionality / capability of a SYSTEM</rdfs:comment>
-    <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
-    <rdfs:domain rdf:resource="#SYSTEM"/>
-  </owl:DatatypeProperty>
   <owl:DatatypeProperty rdf:about="#commodity">
     <rdfs:comment xml:lang="en">the thing conveyed by the interface</rdfs:comment>
     <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>

diff --git a/RACK-Ontology/ontology/SYSTEM.sadl b/RACK-Ontology/ontology/SYSTEM.sadl
@@ -35,8 +35,8 @@ SYSTEM
 
 	requires (note "List of entities that this SYSTEM requires from others") describes SYSTEM with values of type FUNCTION.
 
-	functionalityOverview (note "functionality / capability of a SYSTEM") describes SYSTEM with values of type string. 
-	functionalityOverview describes SYSTEM with at most 1 value.
+	function (note "functionality / capability of a SYSTEM") describes SYSTEM with values of type FUNCTION. 
+	function is a type of wasImpactedBy. 
 
 INTERFACE
 	(note "INTERFACEs describe directed connections between a SYSTEM providing what another SYSTEM requires")
@@ -55,7 +55,6 @@ INTERFACE
 
 	identifiedBy (note "ACTIVITY out of which this INTERFACE was identified") describes INTERFACE with values of type ACTIVITY.
 
-
 SYSTEM_DEVELOPMENT
 	(note "ACTIVITY relating to the creation of one or more some SYSTEMs")
 	is a type of ACTIVITY.