Issue573 (#597)

* Initial commit of updates to add TEST_PROCEDURE and related sub-classes * Adding Ontology for hardware * updated TESTING to add missing notes and use a collection for TEST_STEP and TEST_RECORD * corrected cardinality for "next" properties corrected domain for nextRecord and logs * re-merged changes from master * updated owl models
ge-high-assurance · Dec 2, 2021 · 09962dd · 09962dd
1 parent 38f6e7f
commit 09962dd
Show file tree

Hide file tree

Showing 10 changed files with 315 additions and 192 deletions.
diff --git a/RACK-Ontology/OwlModels/.gitignore b/RACK-Ontology/OwlModels/.gitignore
@@ -0,0 +1,40 @@
+/AGENTS.owl
+/ANALYSIS.owl
+/ARP-4754A.owl
+/CONFIDENCE.owl
+/CPP.owl
+/CounterApplication.owl
+/CounterApplicationLLR.owl
+/CounterApplicationRequirements.owl
+/CounterApplicationTesting.owl
+/CounterApplicationUnitTesting.owl
+/DO-178C.owl
+/DO-330.owl
+/DOCUMENT.owl
+/GenerateCSV.owl
+/GeneratePropInfoCSV.owl
+/HAZARD.owl
+/HazardAssessment.owl
+/InGateRequirements.owl
+/MIL-STD-881D-AppxA.owl
+/MIL-STD-881D-AppxB.owl
+/MIL-STD-881D-AppxC.owl
+/MIL-STD-881D-AppxD.owl
+/MIL-STD-881D.owl
+/PROCESS.owl
+/PROV-S.owl
+/REQUIREMENTS.owl
+/REVIEW.owl
+/SACM-S.owl
+/SOFTWARE.owl
+/SYSTEM.owl
+/SadlBuiltinFunctions.owl
+/SadlImplicitModel.owl
+/TESTING.owl
+/Turnstiles.owl
+/RdfsSubset.owl
+/GenerateCSVQueries.owl
+/RunCSVQueries.owl
+/FILE.owl
+/BASELINE.owl
+/MODEL.owl
diff --git a/RACK-Ontology/OwlModels/CONFIDENCE.owl b/RACK-Ontology/OwlModels/CONFIDENCE.owl
@@ -19,29 +19,26 @@
   <owl:Class rdf:ID="CONFIDENCE_ASSESSMENT">
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:onDataRange rdf:resource="http://www.w3.org/2001/XMLSchema#float"/>
-        <owl:qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#long"
-        >1</owl:qualifiedCardinality>
+        <owl:cardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:cardinality>
         <owl:onProperty>
           <owl:DatatypeProperty rdf:ID="uncertainty"/>
         </owl:onProperty>
       </owl:Restriction>
     </rdfs:subClassOf>
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:onDataRange rdf:resource="http://www.w3.org/2001/XMLSchema#float"/>
-        <owl:qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#long"
-        >1</owl:qualifiedCardinality>
+        <owl:cardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:cardinality>
         <owl:onProperty>
           <owl:DatatypeProperty rdf:ID="disbelief"/>
         </owl:onProperty>
       </owl:Restriction>
     </rdfs:subClassOf>
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:onDataRange rdf:resource="http://www.w3.org/2001/XMLSchema#float"/>
-        <owl:qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#long"
-        >1</owl:qualifiedCardinality>
+        <owl:cardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:cardinality>
         <owl:onProperty>
           <owl:DatatypeProperty rdf:ID="belief"/>
         </owl:onProperty>

diff --git a/RACK-Ontology/OwlModels/FILE.owl b/RACK-Ontology/OwlModels/FILE.owl
@@ -23,9 +23,8 @@
   <owl:Class rdf:ID="FILE">
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:onDataRange rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
-        <owl:qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#long"
-        >1</owl:qualifiedCardinality>
+        <owl:cardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:cardinality>
         <owl:onProperty>
           <owl:DatatypeProperty rdf:ID="filename"/>
         </owl:onProperty>
@@ -63,19 +62,17 @@
   <owl:Class rdf:ID="FILE_HASH">
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:onDataRange rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
-        <owl:qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#long"
-        >1</owl:qualifiedCardinality>
+        <owl:cardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:cardinality>
         <owl:onProperty>
           <owl:DatatypeProperty rdf:ID="hashValue"/>
         </owl:onProperty>
       </owl:Restriction>
     </rdfs:subClassOf>
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:onClass rdf:resource="#HASH_TYPE"/>
-        <owl:qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#long"
-        >1</owl:qualifiedCardinality>
+        <owl:cardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:cardinality>
         <owl:onProperty>
           <owl:ObjectProperty rdf:ID="hashType"/>
         </owl:onProperty>

diff --git a/RACK-Ontology/OwlModels/HAZARD.owl b/RACK-Ontology/OwlModels/HAZARD.owl
@@ -46,15 +46,6 @@
         </owl:onProperty>
       </owl:Restriction>
     </rdfs:subClassOf>
-    <rdfs:subClassOf>
-      <owl:Restriction>
-        <owl:maxCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
-        >1</owl:maxCardinality>
-        <owl:onProperty>
-          <owl:DatatypeProperty rdf:ID="definition"/>
-        </owl:onProperty>
-      </owl:Restriction>
-    </rdfs:subClassOf>
     <rdfs:comment xml:lang="en">HAZARD as identified by some HAZARD_IDENTIFICATION ACTIVITY, to be assessed for certification</rdfs:comment>
     <rdfs:subClassOf rdf:resource="PROV-S#ENTITY"/>
   </owl:Class>
@@ -83,11 +74,6 @@
     <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#float"/>
     <rdfs:domain rdf:resource="#HAZARD"/>
   </owl:DatatypeProperty>
-  <owl:DatatypeProperty rdf:about="#definition">
-    <rdfs:comment xml:lang="en">Description of the HAZARD</rdfs:comment>
-    <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
-    <rdfs:domain rdf:resource="#HAZARD"/>
-  </owl:DatatypeProperty>
   <owl:DatatypeProperty rdf:about="#severity">
     <rdfs:comment xml:lang="en">the severity of the HAZARD</rdfs:comment>
     <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#float"/>

diff --git a/RACK-Ontology/OwlModels/MODEL.owl b/RACK-Ontology/OwlModels/MODEL.owl
@@ -19,9 +19,8 @@
   <owl:Class rdf:ID="MODEL">
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:onClass rdf:resource="PROV-S#THING"/>
-        <owl:qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#long"
-        >1</owl:qualifiedCardinality>
+        <owl:cardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:cardinality>
         <owl:onProperty>
           <owl:ObjectProperty rdf:ID="models"/>
         </owl:onProperty>

diff --git a/RACK-Ontology/OwlModels/SOFTWARE.owl b/RACK-Ontology/OwlModels/SOFTWARE.owl
@@ -39,9 +39,8 @@
   <owl:Class rdf:ID="SWCOMPONENT">
     <rdfs:subClassOf>
       <owl:Restriction>
-        <owl:onClass rdf:resource="#COMPONENT_TYPE"/>
-        <owl:qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#long"
-        >1</owl:qualifiedCardinality>
+        <owl:cardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:cardinality>
         <owl:onProperty>
           <owl:ObjectProperty rdf:ID="componentType"/>
         </owl:onProperty>
@@ -51,21 +50,6 @@
     <rdfs:subClassOf rdf:resource="PROV-S#ENTITY"/>
   </owl:Class>
   <owl:Class rdf:ID="PACKAGE">
-    <rdfs:subClassOf>
-      <owl:Restriction>
-        <owl:someValuesFrom>
-          <owl:Class>
-            <owl:oneOf rdf:parseType="Collection">
-              <rdf:Description rdf:about="AGENTS#PERSON"/>
-              <rdf:Description rdf:about="AGENTS#ORGANIZATION"/>
-            </owl:oneOf>
-          </owl:Class>
-        </owl:someValuesFrom>
-        <owl:onProperty>
-          <owl:ObjectProperty rdf:ID="performedBy"/>
-        </owl:onProperty>
-      </owl:Restriction>
-    </rdfs:subClassOf>
     <rdfs:comment xml:lang="en">ACTIVITY of running a PACKAGER to produce a package FILE</rdfs:comment>
     <rdfs:subClassOf rdf:resource="FILE#FILE_CREATION"/>
   </owl:Class>
@@ -129,7 +113,7 @@
     <rdfs:range rdf:resource="#COMPONENT_TYPE"/>
     <rdfs:domain rdf:resource="#SWCOMPONENT"/>
   </owl:ObjectProperty>
-  <owl:ObjectProperty rdf:about="#performedBy">
+  <owl:ObjectProperty rdf:ID="performedBy">
     <rdfs:comment xml:lang="en">AGENT(s) (e.g. PACKAGER) performing the packaging</rdfs:comment>
     <rdfs:domain>
       <owl:Class>