Merge pull request #665 from ge-high-assurance/am-cleanup

Cleaned up ontology
ge-high-assurance · Feb 28, 2022 · 4687eaf · 4687eaf
2 parents d5b1706 + af48694
commit 4687eaf
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Boeing-Ontology/ontology/Boeing.sadl b/Boeing-Ontology/ontology/Boeing.sadl
@@ -47,7 +47,6 @@ confirms of SBVT_Result only has values of type SBVT_Test.
         used of DevelopSystemArchitecture only has values of type SystemConOps. 
 
      SystemArchitecture (note "specification of system architecture") is a type of ENTITY. 
-      //AM what is the difference between wasGeneratedBy and original DesCert:createdBy? so using wasGeneratedBy
        wasGeneratedBy of SystemArchitecture only has values of type DevelopSystemArchitecture. 
        isArchitectureOf describes SystemArchitecture with values of type SYSTEM.
        isArchitectureOf is a type of wasImpactedBy.
@@ -74,8 +73,6 @@ confirms of SBVT_Result only has values of type SBVT_Test.
 //       content of SubDD_Doc only has values of type SoftwareLowLevelRequirement. 
        content of SubDD_Doc only has values of type SubDD_Req. 
        wasGeneratedBy of SubDD_Doc only has values of type SoftwareDesign. 
-       governs of SubDD_Doc only has values of type SWCOMPONENT.
-       governs describes SubDD_Doc with at most 1 value.
 
      SoftwareDesign is a type of REQUIREMENT_DEVELOPMENT.
 		wasInformedBy of SoftwareDesign only has values of type {SoftwareHighLevelRequirementsDefinition or DevelopSystemArchitecture}.

diff --git a/RACK-Ontology/ontology/DOCUMENT.sadl b/RACK-Ontology/ontology/DOCUMENT.sadl
@@ -30,7 +30,7 @@ import "http://arcos.rack/PROV-S".
 DOCUMENT
     (note "A piece of written, printed, or electronic matter that provides information or evidence or that serves as an official record.")
     is a type of COLLECTION.
-    versionNumber describes DOCUMENT with values of type string.
+    versionNumber (note "The release version of the document") describes DOCUMENT with values of type string.
     versionNumber describes DOCUMENT with at most 1 value.
 
     dateOfIssue (note "Release date for the document.") describes DOCUMENT with values of type date.

diff --git a/RACK-Ontology/ontology/GeneratePropInfoCSV.sadl b/RACK-Ontology/ontology/GeneratePropInfoCSV.sadl
@@ -13,14 +13,17 @@
 uri "http://arcos.rack/GeneratePropInfoCSV" alias genpropinfo.
 import "http://arcos.rack/AGENTS".
 import "http://arcos.rack/ANALYSIS".
+import "http://arcos.rack/BASELINE".
 import "http://arcos.rack/CONFIDENCE".
 import "http://arcos.rack/DOCUMENT".
 import "http://arcos.rack/FILE".
+import "http://arcos.rack/HARDWARE".
 import "http://arcos.rack/HAZARD".
 import "http://arcos.rack/MODEL".
 import "http://arcos.rack/PROCESS".
 import "http://arcos.rack/REQUIREMENTS".
 import "http://arcos.rack/REVIEW".
+import "http://arcos.rack/SECURITY".
 import "http://arcos.rack/SOFTWARE".
 import "http://arcos.rack/SYSTEM".
 import "http://arcos.rack/TESTING".