From c06b30f59b1f61e573257b8c076998cc8090e5e4 Mon Sep 17 00:00:00 2001 From: Eric Mertens Date: Tue, 2 Nov 2021 13:11:57 -0700 Subject: [PATCH] Remove extra subtypes of wasGeneratedBy --- Boeing-Ontology/OwlModels/Boeing.owl | 266 ++++- GrammaTech-Ontology/OwlModels/GrammaTech.owl | 11 +- RACK-Ontology/OwlModels/.gitignore | 1 + RACK-Ontology/OwlModels/AGENTS.owl | 17 + RACK-Ontology/OwlModels/ANALYSIS.owl | 45 +- RACK-Ontology/OwlModels/CONFIDENCE.owl | 21 +- RACK-Ontology/OwlModels/FILE.owl | 30 +- .../OwlModels/GeneratePropInfoCSV.owl | 1 + RACK-Ontology/OwlModels/HAZARD.owl | 5 - RACK-Ontology/OwlModels/MODEL.owl | 5 +- RACK-Ontology/OwlModels/PROCESS.owl | 21 + RACK-Ontology/OwlModels/PROV-S.owl | 5 + RACK-Ontology/OwlModels/REQUIREMENTS.owl | 22 +- RACK-Ontology/OwlModels/REVIEW.owl | 6 - RACK-Ontology/OwlModels/SOFTWARE.owl | 5 +- RACK-Ontology/OwlModels/SYSTEM.owl | 15 - RACK-Ontology/OwlModels/TESTING.owl | 17 +- RACK-Ontology/OwlModels/ont-policy.rdf | 336 +++--- RACK-Ontology/ontology/ANALYSIS.sadl | 1 - RACK-Ontology/ontology/CONFIDENCE.sadl | 3 - RACK-Ontology/ontology/FILE.sadl | 6 +- RACK-Ontology/ontology/HAZARD.sadl | 2 - RACK-Ontology/ontology/REQUIREMENTS.sadl | 6 - RACK-Ontology/ontology/REVIEW.sadl | 3 - RACK-Ontology/ontology/SYSTEM.sadl | 4 - RACK-Ontology/ontology/TESTING.sadl | 6 - SRI-Ontology/OwlModels/SRI.owl | 994 ++++++------------ STR-Ontology/OwlModels/STR.owl | 8 +- sadl-examples/Example.sadl | 2 +- sadl-examples/Magic.sadl | 13 + sadl-examples/RequirementAnalysisExample.sadl | 2 +- sadl-examples/ShellCheckAnalysisExample.sadl | 5 +- 32 files changed, 881 insertions(+), 1003 deletions(-) create mode 100644 sadl-examples/Magic.sadl diff --git a/Boeing-Ontology/OwlModels/Boeing.owl b/Boeing-Ontology/OwlModels/Boeing.owl index 1877aa4d..c34282f4 100644 --- a/Boeing-Ontology/OwlModels/Boeing.owl +++ b/Boeing-Ontology/OwlModels/Boeing.owl @@ -1,21 +1,85 @@ + This ontology was created from a SADL file 'Boeing.sadl' and should not be directly edited. + + - + + + + + + + + + - This ontology was created from a SADL file 'Boeing-Ontology.sadl' and should not be directly edited. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -28,37 +92,207 @@ A Requirement identified in the Subsystem Design Document - - A Requirement identified in the Software Requirements Specification - + + + + + + + + + + + + + + + + + + - + - 1 - + + - A test identified in the Software Baseline Verification Tests - + - - A Requirement identified in the Prime Item Development Specification + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + specification of system architecture + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A Requirement identified in the Software Requirements Specification A Requirement identified in the Crew Systems Interface Document + + A Requirement identified in the Prime Item Development Specification + + - + + + A result identified for a SBVT_Test (Software Baseline Verification Tests) + + + + 1 + + + + A test identified in the Software Baseline Verification Tests + + + + A concrete software component + + + + Person agents are people - alias for User + + + + + + + + + + + diff --git a/GrammaTech-Ontology/OwlModels/GrammaTech.owl b/GrammaTech-Ontology/OwlModels/GrammaTech.owl index 6673c6bb..a10687ab 100644 --- a/GrammaTech-Ontology/OwlModels/GrammaTech.owl +++ b/GrammaTech-Ontology/OwlModels/GrammaTech.owl @@ -1,13 +1,18 @@ diff --git a/RACK-Ontology/OwlModels/.gitignore b/RACK-Ontology/OwlModels/.gitignore index 84ed8d04..4df7ab70 100644 --- a/RACK-Ontology/OwlModels/.gitignore +++ b/RACK-Ontology/OwlModels/.gitignore @@ -36,3 +36,4 @@ /GenerateCSVQueries.owl /RunCSVQueries.owl /FILE.owl +/BASELINE.owl diff --git a/RACK-Ontology/OwlModels/AGENTS.owl b/RACK-Ontology/OwlModels/AGENTS.owl index db0cd85b..d254ef6e 100644 --- a/RACK-Ontology/OwlModels/AGENTS.owl +++ b/RACK-Ontology/OwlModels/AGENTS.owl @@ -26,6 +26,15 @@ + + + 1 + + + + + An aid (software, hardware, etc) that automates the performance of an activity. @@ -47,6 +56,14 @@ Person agents are people - alias for User + + + + + + + + Relates people to the company they were acting on behalf of. diff --git a/RACK-Ontology/OwlModels/ANALYSIS.owl b/RACK-Ontology/OwlModels/ANALYSIS.owl index 61e00434..9f57ecd0 100644 --- a/RACK-Ontology/OwlModels/ANALYSIS.owl +++ b/RACK-Ontology/OwlModels/ANALYSIS.owl @@ -16,19 +16,6 @@ This ontology was created from a SADL file 'ANALYSIS.sadl' and should not be directly edited. - - - - 1 - - - - - - A result of the analysis that is linked to some specific part of the system. - - Output of an ANALYSIS @@ -37,42 +24,34 @@ ACTIVITY of running some analysis, and as a result creating some ANALYSIS_OUTPUT - - An open/extensible set of analysis findings. - - - Agent responsible for producing the output. + Tool responsible for producing the output. - - - ACTIVITY(s) (e.g. ANALYSIS) producing this output - - - - - Which analysis report this annotation comes from. - - - Agent responsible for running the analysis. + + + Entities targetted by the analysis. + + + ENTITY(s) under analysis - - Individual elements of the result. - - + + + Parameters/options etc. for the tool used. + + diff --git a/RACK-Ontology/OwlModels/CONFIDENCE.owl b/RACK-Ontology/OwlModels/CONFIDENCE.owl index 1e790e3b..44c9fe5a 100644 --- a/RACK-Ontology/OwlModels/CONFIDENCE.owl +++ b/RACK-Ontology/OwlModels/CONFIDENCE.owl @@ -19,8 +19,9 @@ - 1 + + 1 @@ -28,8 +29,9 @@ - 1 + + 1 @@ -37,8 +39,9 @@ - 1 + + 1 @@ -70,12 +73,6 @@ - - - ACTIVITY(s) (e.g. ASSESSING_CONFIDENCE) that created this assessment. - - - ENTITY responsible for producing the assessment, could be a person or a tool diff --git a/RACK-Ontology/OwlModels/FILE.owl b/RACK-Ontology/OwlModels/FILE.owl index 5f94b2b1..746b1dba 100644 --- a/RACK-Ontology/OwlModels/FILE.owl +++ b/RACK-Ontology/OwlModels/FILE.owl @@ -23,17 +23,9 @@ - 1 - - - - - - - - 1 + + 1 @@ -71,8 +63,9 @@ - 1 + + 1 @@ -80,8 +73,9 @@ - 1 + + 1 @@ -100,12 +94,6 @@ - - - FILE_CREATION ACTIVITY that created this file - - - The byte-level encoding of a file diff --git a/RACK-Ontology/OwlModels/GeneratePropInfoCSV.owl b/RACK-Ontology/OwlModels/GeneratePropInfoCSV.owl index 58be98d9..01a77bcc 100644 --- a/RACK-Ontology/OwlModels/GeneratePropInfoCSV.owl +++ b/RACK-Ontology/OwlModels/GeneratePropInfoCSV.owl @@ -13,6 +13,7 @@ xmlns:H="http://arcos.rack/HAZARD#" xmlns:sw="http://arcos.rack/SOFTWARE#" xmlns:genpropinfo="http://arcos.rack/GeneratePropInfoCSV#" + xmlns:M="http://arcos.rack/MODEL#" xmlns:sys="http://arcos.rack/SYSTEM#" xmlns:An="http://arcos.rack/ANALYSIS#" xmlns:owl="http://www.w3.org/2002/07/owl#" diff --git a/RACK-Ontology/OwlModels/HAZARD.owl b/RACK-Ontology/OwlModels/HAZARD.owl index 9912bfe3..3d3182b2 100644 --- a/RACK-Ontology/OwlModels/HAZARD.owl +++ b/RACK-Ontology/OwlModels/HAZARD.owl @@ -62,11 +62,6 @@ ACTIVITY that identifies potential sources of HAZARD whose risk must be evaluated - - how this HAZARD was identified - - - AGENT(s) who work on this ACTIVITY diff --git a/RACK-Ontology/OwlModels/MODEL.owl b/RACK-Ontology/OwlModels/MODEL.owl index 35afc6d5..c813ccce 100644 --- a/RACK-Ontology/OwlModels/MODEL.owl +++ b/RACK-Ontology/OwlModels/MODEL.owl @@ -19,8 +19,9 @@ - 1 + + 1 diff --git a/RACK-Ontology/OwlModels/PROCESS.owl b/RACK-Ontology/OwlModels/PROCESS.owl index 6e9293c3..319c7dd0 100644 --- a/RACK-Ontology/OwlModels/PROCESS.owl +++ b/RACK-Ontology/OwlModels/PROCESS.owl @@ -16,6 +16,10 @@ This ontology was created from a SADL file 'PROCESS.sadl' and should not be directly edited. + + A general property that holds on the basis of some ANALYSIS + + An OBJECTIVE identifies tasks from a process for which evidence must be provided to show that the task has been completed. @@ -25,4 +29,21 @@ + + + ENTITY(s) over which the PROPERTY holds + + + + + + ENTITY(s) that is being mitigated by this PROPERTY + + + + + One or more PROPERTY may be needed to address an OBJECTIVE. + + + diff --git a/RACK-Ontology/OwlModels/PROV-S.owl b/RACK-Ontology/OwlModels/PROV-S.owl index 358d4ccd..434a5053 100644 --- a/RACK-Ontology/OwlModels/PROV-S.owl +++ b/RACK-Ontology/OwlModels/PROV-S.owl @@ -168,6 +168,11 @@ + + Purpose of the ACTIVITY + + + An entity in a collection. diff --git a/RACK-Ontology/OwlModels/REQUIREMENTS.owl b/RACK-Ontology/OwlModels/REQUIREMENTS.owl index 4da8bbf3..9ca59ae9 100644 --- a/RACK-Ontology/OwlModels/REQUIREMENTS.owl +++ b/RACK-Ontology/OwlModels/REQUIREMENTS.owl @@ -16,14 +16,14 @@ This ontology was created from a SADL file 'REQUIREMENTS.sadl' and should not be directly edited. - - Captures (both high- and low-level) properties of a process or artifact that are to be assessed - - ACTIVITY that produces REQUIREMENTs + + Captures (both high- and low-level) properties of a process or artifact that are to be assessed + + Defines some conceptual data that may be collected somewhere and used somewhere else @@ -52,20 +52,6 @@ - - ACTIVITY(s) (e.g. REQUIREMENT_DEVELOPMENT) that created this data dictionary term - - - - - - - - - ACTIVITY(s) (e.g. REQUIREMENT_DEVELOPMENT) that created this REQUIREMENT - - - Source materials (requirement and design docs) used during development diff --git a/RACK-Ontology/OwlModels/REVIEW.owl b/RACK-Ontology/OwlModels/REVIEW.owl index 9012ec55..40fc801a 100644 --- a/RACK-Ontology/OwlModels/REVIEW.owl +++ b/RACK-Ontology/OwlModels/REVIEW.owl @@ -63,12 +63,6 @@ - - - ACTIVITY(s) (e.g. REVIEW) that created this log - - - Review status descriptor diff --git a/RACK-Ontology/OwlModels/SOFTWARE.owl b/RACK-Ontology/OwlModels/SOFTWARE.owl index e4b22c82..869a0bb5 100644 --- a/RACK-Ontology/OwlModels/SOFTWARE.owl +++ b/RACK-Ontology/OwlModels/SOFTWARE.owl @@ -39,8 +39,9 @@ - 1 + + 1 diff --git a/RACK-Ontology/OwlModels/SYSTEM.owl b/RACK-Ontology/OwlModels/SYSTEM.owl index 062f4af8..5d128c15 100644 --- a/RACK-Ontology/OwlModels/SYSTEM.owl +++ b/RACK-Ontology/OwlModels/SYSTEM.owl @@ -40,15 +40,6 @@ - - - 1 - - - - - SYSTEMs classify logical parts of the whole system being developed @@ -91,12 +82,6 @@ - - - ACTIVITY(s) participating in developing this SYSTEM - - - allows for decomposition of functionality diff --git a/RACK-Ontology/OwlModels/TESTING.owl b/RACK-Ontology/OwlModels/TESTING.owl index e7523bbf..f0ed811a 100644 --- a/RACK-Ontology/OwlModels/TESTING.owl +++ b/RACK-Ontology/OwlModels/TESTING.owl @@ -46,8 +46,9 @@ - 1 + + 1 @@ -77,24 +78,12 @@ - - - TEST_DEVELOPMENT activity(s) this test belongs to - - - Parent test(s) of this test result - - - ACTIVITY(s) that created this test result - - - Pass/Failed/Indeterminate status resulting from a TEST_EXECUTION diff --git a/RACK-Ontology/OwlModels/ont-policy.rdf b/RACK-Ontology/OwlModels/ont-policy.rdf index b3e9aa12..d1ff3643 100644 --- a/RACK-Ontology/OwlModels/ont-policy.rdf +++ b/RACK-Ontology/OwlModels/ont-policy.rdf @@ -2,12 +2,18 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:j.0="http://jena.hpl.hp.com/schemas/2003/03/ont-manager#"> - - MIL-STD-881D-AppxB + platform:/resource/RACK-Ontology/ontology/HAZARD.sadl + H SADL - - platform:/resource/RACK-Ontology/ontology/MIL-STD-881D/MIL-STD-881D-AppxB.sadl + + + + + SRL_Metrics + + + SRL_Metrics @@ -16,252 +22,276 @@ - SRL_Metrics + + builtinfunctions - - + SADL + + platform:/resource/RACK-Ontology/ImplicitModel/SadlBuiltinFunctions.sadl SRL_Metrics - - + + - platform:/resource/RACK-Ontology/ontology/PROV-S.sadl - provs + + Ag SADL - - + + platform:/resource/RACK-Ontology/ontology/AGENTS.sadl SRL_Metrics - - + + - platform:/resource/RACK-Ontology/ontology/REVIEW.sadl - Rv + + ARP-4754A SADL - - + + platform:/resource/RACK-Ontology/ontology/ARP-4754A/ARP-4754A.sadl - platform:/resource/RACK-Ontology/ontology/DOCUMENT.sadl - D + SRL_Metrics - SADL - - + + - platform:/resource/RACK-Ontology/ontology/ANALYSIS.sadl - An + SRL_Metrics - SADL - - + + - - m881D + + MIL-STD-881D-AppxD SADL - - platform:/resource/RACK-Ontology/ontology/MIL-STD-881D/MIL-STD-881D.sadl + + platform:/resource/RACK-Ontology/ontology/MIL-STD-881D/MIL-STD-881D-AppxD.sadl - platform:/resource/RACK-Ontology/ImplicitModel/SadlBuiltinFunctions.sadl - builtinfunctions + SRL_Metrics - SADL - - + + SRL_Metrics - - + + - platform:/resource/RACK-Ontology/ontology/CONFIDENCE.sadl - CONFIDENCE + + tst SADL - - + + platform:/resource/RACK-Ontology/ontology/TESTING.sadl - - H + SRL_Metrics + + + + + + + sys SADL - - platform:/resource/RACK-Ontology/ontology/HAZARD.sadl + + platform:/resource/RACK-Ontology/ontology/SYSTEM.sadl - SRL_Metrics + + Rv - - + SADL + + platform:/resource/RACK-Ontology/ontology/REVIEW.sadl - SRL_Metrics + + - - + SADL + sadllistmodel - platform:/resource/RACK-Ontology/ontology/SOFTWARE.sadl + sw SADL - + platform:/resource/RACK-Ontology/ontology/SOFTWARE.sadl - - MIL-STD-881D-AppxA + + CONFIDENCE SADL - - platform:/resource/RACK-Ontology/ontology/MIL-STD-881D/MIL-STD-881D-AppxA.sadl + + platform:/resource/RACK-Ontology/ontology/CONFIDENCE.sadl - SRL_Metrics + platform:/resource/RACK-Ontology/ontology/BASELINE.sadl + baseline + SADL - - + + - SRL_Metrics + + genpropinfo - - + SADL + + platform:/resource/RACK-Ontology/ontology/GeneratePropInfoCSV.sadl SRL_Metrics - - + + - platform:/resource/RACK-Ontology/ontology/ARP-4754A/ARP-4754A.sadl - ARP-4754A + platform:/resource/RACK-Ontology/ontology/MODEL.sadl + SADL - - + M + - platform:/resource/RACK-Ontology/ontology/SACM-S.sadl - sacms + + m881D SADL - - + + platform:/resource/RACK-Ontology/ontology/MIL-STD-881D/MIL-STD-881D.sadl SRL_Metrics - - + + SRL_Metrics - - + + - platform:/resource/RACK-Ontology/ontology/FILE.sadl - file + SRL_Metrics + + + + + + + An SADL - - + + platform:/resource/RACK-Ontology/ontology/ANALYSIS.sadl SRL_Metrics - - + + - SRL_Metrics + + provs - - + SADL + + platform:/resource/RACK-Ontology/ontology/PROV-S.sadl - platform:/resource/RACK-Ontology/ontology/REQUIREMENTS.sadl - Rq + + file SADL - - + + platform:/resource/RACK-Ontology/ontology/FILE.sadl SRL_Metrics - - SRL_Metrics - - + + + + + + + + SADL + sadlbasemodel SRL_Metrics - - + + SRL_Metrics + + - platform:/resource/RACK-Ontology/ontology/AGENTS.sadl - Ag + SRL_Metrics - SADL - - + + - platform:/resource/RACK-Ontology/ontology/DO-178C/DO-178C.sadl - DO-178C + + Pr SADL - - + + platform:/resource/RACK-Ontology/ontology/PROCESS.sadl - SRL_Metrics + platform:/resource/RACK-Ontology/ontology/MIL-STD-881D/MIL-STD-881D-AppxA.sadl + MIL-STD-881D-AppxA - - + SADL + + - SRL_Metrics + + DO-330 - - + SADL + + platform:/resource/RACK-Ontology/ontology/DO-330/DO-330.sadl - platform:/resource/RACK-Ontology/ontology/SYSTEM.sadl - sys + SRL_Metrics - SADL - - + + @@ -272,75 +302,67 @@ platform:/resource/RACK-Ontology/ontology/MIL-STD-881D/MIL-STD-881D-AppxC.sadl - platform:/resource/RACK-Ontology/ImplicitModel/SadlImplicitModel.sadl - sadlimplicitmodel + + MIL-STD-881D-AppxB SADL - - + + platform:/resource/RACK-Ontology/ontology/MIL-STD-881D/MIL-STD-881D-AppxB.sadl - SRL_Metrics + + Rq - - + SADL + + platform:/resource/RACK-Ontology/ontology/REQUIREMENTS.sadl - platform:/resource/RACK-Ontology/ontology/PROCESS.sadl - Pr + + D SADL - - + + platform:/resource/RACK-Ontology/ontology/DOCUMENT.sadl - - MIL-STD-881D-AppxD + SRL_Metrics - SADL - - platform:/resource/RACK-Ontology/ontology/MIL-STD-881D/MIL-STD-881D-AppxD.sadl + + SRL_Metrics - - + + - platform:/resource/RACK-Ontology/ontology/DO-330/DO-330.sadl - DO-330 + platform:/resource/RACK-Ontology/ontology/DO-178C/DO-178C.sadl + DO-178C SADL - - + + SRL_Metrics - - + + SRL_Metrics - - - - - platform:/resource/RACK-Ontology/ontology/TESTING.sadl - tst - - SADL - - + + - platform:/resource/RACK-Ontology/ontology/GeneratePropInfoCSV.sadl - genpropinfo + + sadlimplicitmodel SADL - - + + platform:/resource/RACK-Ontology/ImplicitModel/SadlImplicitModel.sadl diff --git a/RACK-Ontology/ontology/ANALYSIS.sadl b/RACK-Ontology/ontology/ANALYSIS.sadl index b8797bf2..cc749351 100644 --- a/RACK-Ontology/ontology/ANALYSIS.sadl +++ b/RACK-Ontology/ontology/ANALYSIS.sadl @@ -47,4 +47,3 @@ ANALYSIS_OUTPUT analyzes (note "ENTITY(s) under analysis") describes ANALYSIS_OUTPUT with values of type ENTITY. analyzes is a type of wasImpactedBy. - diff --git a/RACK-Ontology/ontology/CONFIDENCE.sadl b/RACK-Ontology/ontology/CONFIDENCE.sadl index ae320db5..5eb525d0 100644 --- a/RACK-Ontology/ontology/CONFIDENCE.sadl +++ b/RACK-Ontology/ontology/CONFIDENCE.sadl @@ -28,9 +28,6 @@ CONFIDENCE_ASSESSMENT (note "Superclass for confidence assessments over some oth assesses describes CONFIDENCE_ASSESSMENT with at most 1 value. assesses is a type of wasImpactedBy. - createBy (note "ACTIVITY(s) (e.g. ASSESSING_CONFIDENCE) that created this assessment.") describes CONFIDENCE_ASSESSMENT with values of type ACTIVITY. - createBy is a type of wasGeneratedBy. - BDU_CONFIDENCE_ASSESSMENT (note "A belief-disbelief-uncertainty confidence assessment, c.f. Subjective Logic. belief, disbelief, and uncertainty should sum to 1") is a type of CONFIDENCE_ASSESSMENT. belief (note "belief that an assessment is true") describes CONFIDENCE_ASSESSMENT with a single value of type float. // [0,1]. disbelief (note "belief that an assessment is false") describes CONFIDENCE_ASSESSMENT with a single value of type float. // [0,1]. diff --git a/RACK-Ontology/ontology/FILE.sadl b/RACK-Ontology/ontology/FILE.sadl index 15b13923..856e7cc1 100644 --- a/RACK-Ontology/ontology/FILE.sadl +++ b/RACK-Ontology/ontology/FILE.sadl @@ -36,11 +36,7 @@ FILE satisfies (note "ENTITY(s) (e.g. REQUIREMENT) that this code file participates in satisfying") describes FILE with values of type ENTITY. satisfies is a type of wasImpactedBy. - createdBy (note "FILE_CREATION ACTIVITY that created this file") describes FILE with values of type FILE_CREATION. - createdBy describes FILE with at most 1 value. - createdBy is a type of wasGeneratedBy. - -fileHash (note "Hash of the file contents") describes FILE with values of type FILE_HASH. + fileHash (note "Hash of the file contents") describes FILE with values of type FILE_HASH. FORMAT (note "The data format of a FILE") diff --git a/RACK-Ontology/ontology/HAZARD.sadl b/RACK-Ontology/ontology/HAZARD.sadl index fbc95f6f..cd2394e4 100644 --- a/RACK-Ontology/ontology/HAZARD.sadl +++ b/RACK-Ontology/ontology/HAZARD.sadl @@ -36,8 +36,6 @@ HAZARD H:source (note "ENTITY(s) that participate in causing this HAZARD") describes HAZARD with values of type ENTITY. H:source is a type of wasImpactedBy. - identified (note "how this HAZARD was identified") describes HAZARD with values of type HAZARD_IDENTIFICATION. - effect (note "consequence(s) of the HAZARD") describes HAZARD with values of type string. effect describes HAZARD with at most 1 value. diff --git a/RACK-Ontology/ontology/REQUIREMENTS.sadl b/RACK-Ontology/ontology/REQUIREMENTS.sadl index 590e6054..5d440959 100644 --- a/RACK-Ontology/ontology/REQUIREMENTS.sadl +++ b/RACK-Ontology/ontology/REQUIREMENTS.sadl @@ -36,9 +36,6 @@ REQUIREMENT Rq:mitigates (note "ENTITY(s) (e.g. HAZARD) that is being mitigated by this REQUIREMENT") describes REQUIREMENT with values of type ENTITY. Rq:mitigates is a type of wasImpactedBy. - Rq:createdBy (note "ACTIVITY(s) (e.g. REQUIREMENT_DEVELOPMENT) that created this REQUIREMENT") describes REQUIREMENT with values of type ACTIVITY. - Rq:createdBy is a type of wasGeneratedBy. - DATA_DICTIONARY_TERM (note "Defines some conceptual data that may be collected somewhere and used somewhere else") is a type of ENTITY. @@ -49,9 +46,6 @@ DATA_DICTIONARY_TERM consumedBy (note "ENTITY(s) (e.g. REQUIREMENT) that consumes this information") describes DATA_DICTIONARY_TERM with values of type ENTITY. consumedBy is a type of wasImpactedBy. - Rq:createdBy (note "ACTIVITY(s) (e.g. REQUIREMENT_DEVELOPMENT) that created this data dictionary term") describes DATA_DICTIONARY_TERM with values of type ACTIVITY. - Rq:createdBy is a type of wasGeneratedBy. - REQUIREMENT_DEVELOPMENT (note "ACTIVITY that produces REQUIREMENTs") diff --git a/RACK-Ontology/ontology/REVIEW.sadl b/RACK-Ontology/ontology/REVIEW.sadl index 1bbb8062..d61cb28f 100644 --- a/RACK-Ontology/ontology/REVIEW.sadl +++ b/RACK-Ontology/ontology/REVIEW.sadl @@ -31,9 +31,6 @@ REVIEW_LOG reviewResult (note "Review status descriptor") describes REVIEW_LOG with values of type REVIEW_STATE. - createBy (note "ACTIVITY(s) (e.g. REVIEW) that created this log") describes REVIEW_LOG with values of type ACTIVITY. - createBy is a type of wasGeneratedBy. - REVIEW_STATE (note "Life-cycle status of a review log") is a type of THING, must be one of {Passed, ReviseWithoutReview, ReviseWithReview}. diff --git a/RACK-Ontology/ontology/SYSTEM.sadl b/RACK-Ontology/ontology/SYSTEM.sadl index 3c40f595..9dd843a3 100644 --- a/RACK-Ontology/ontology/SYSTEM.sadl +++ b/RACK-Ontology/ontology/SYSTEM.sadl @@ -28,10 +28,6 @@ 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 ACTIVITY. - producedBy describes SYSTEM with at most 1 value. - producedBy is a type of wasGeneratedBy. - provides (note "List of entities that this SYSTEM provides to others") describes SYSTEM with values of type FUNCTION. requires (note "List of entities that this SYSTEM requires from others") describes SYSTEM with values of type FUNCTION. diff --git a/RACK-Ontology/ontology/TESTING.sadl b/RACK-Ontology/ontology/TESTING.sadl index 0315eb2e..3228438f 100644 --- a/RACK-Ontology/ontology/TESTING.sadl +++ b/RACK-Ontology/ontology/TESTING.sadl @@ -26,9 +26,6 @@ TEST verifies (note "ENTITY(s) (e.g. REQUIREMENT) that this test verifies") describes TEST with values of type ENTITY. verifies is a type of wasImpactedBy. -// producedBy (note "TEST_DEVELOPMENT activity(s) this test belongs to") describes TEST with values of type ACTIVITY. -// producedBy is a type of wasGeneratedBy. - TEST_STATUS (note "The high-level outcome of a TEST_RESULT") is a type of THING, must be one of {Passed, Failed, Indeterminate}. @@ -45,9 +42,6 @@ TEST_RESULT confirms (note "Parent test(s) of this test result") describes TEST_RESULT with values of type TEST. confirms is a type of wasImpactedBy. - executedBy (note "ACTIVITY(s) that created this test result") describes TEST_RESULT with values of type ACTIVITY. - executedBy is a type of wasGeneratedBy. - TEST_DEVELOPMENT (note "ACTIVITY of creating a TEST to participate in the evaluation of a requirement") is a type of ACTIVITY. diff --git a/SRI-Ontology/OwlModels/SRI.owl b/SRI-Ontology/OwlModels/SRI.owl index 7f2b55ba..213e03b7 100644 --- a/SRI-Ontology/OwlModels/SRI.owl +++ b/SRI-Ontology/OwlModels/SRI.owl @@ -1,15 +1,27 @@ + @@ -26,8 +38,18 @@ + + + + + + + + + + A Requirement identified in the Subsystem Design Document - + @@ -35,59 +57,63 @@ 1 - - - + - + - + - - - - - - + - + + + + + + + + + + Defines some conceptual data that may be collected somewhere and used somewhere else + - + - + - + - + - 1 + + 1 @@ -95,8 +121,11 @@ - 1 + + + + 1 @@ -105,27 +134,29 @@ The model of architecture in Radl + + + - + - + - + - - + + - 1 - - - + + + + Analysis done by Radler tool on Radl architecture specificaton (SystemArchitecture) @@ -140,8 +171,9 @@ - 1 + + 1 @@ -149,8 +181,11 @@ - 1 + + + + 1 @@ -159,115 +194,58 @@ the MODEL class that is used to model a SpecificProperty - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - - - 1 - - - - - - - - - - - - - - - - - + - + - - + - - - - - - - - - - - - - - - - + - + - + - - - - + + + + - + - 1 + + 1 @@ -275,8 +253,11 @@ - 1 + + + + 1 @@ -285,89 +266,60 @@ The model of requirement in DesCert in CLEAR notation - + - - - - - - - - - - - + + + + - + - + - - - - + + + - - - - 1 - - - - - - the instance of tool execution - - - - - - - - + - - - + - + - 1 + + 1 - + - - - - 1 + + 1 - + @@ -375,99 +327,102 @@ 1 - - - + - 1 - - - + + + + + a test obligation - + - + - + - - - - - - - 1 - - - + + - - - - - - - - - - + CLEAR notation for writing requirements - + - + - + - - + + - 1 - - - + 1 + - - - - 1 - - - + + + + - specification of system architecture + + + + + + + + + + + + Captures (both high- and low-level) properties of a process or artifact that are to be assessed - + + + + + + + + + + + + + + + + + + + RADL notation for architecture specification @@ -480,21 +435,12 @@ - - - 1 - - - - - - + @@ -503,8 +449,15 @@ - 1 + + + + + + + + 1 @@ -512,8 +465,9 @@ - 1 + + 1 @@ -521,8 +475,9 @@ - 1 + + 1 @@ -530,8 +485,9 @@ - 1 + + 1 @@ -539,51 +495,97 @@ - 1 + + 1 - the set of JUNIT tests/results generated and executed by Randoop with corresponding test clasification metrics - + the set of JUNIT tests/results generated and executed by Randoop with corresponding test classification metrics + + + + - + - - + 1 + + + - + + + - - + + + + - 1 - - - + + + + + + + + + + + + + + + + + - + + specification of system architecture + + + Sally notation for creating models and property queries + + An aid (software, hardware, etc) that automates the performance of an activity. + + + + A Requirement identified in the Software Requirements Specification + + + + + - + + + + + + + + + @@ -592,8 +594,9 @@ - 1 + + 1 @@ -601,8 +604,9 @@ - 1 + + 1 @@ -610,8 +614,9 @@ - 1 + + 1 @@ -619,132 +624,39 @@ - 1 - - - - - - - - - - - - - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + A Requirement identified in the Prime Item Development Specification + - - - - - - - - - - - - - - - - + - 1 - - - + + - - - - + - + @@ -756,19 +668,37 @@ - tool qualification evidence including tool qualification plan, tool operational requirements, and tool verfication procedures + tool qualification evidence including tool qualification plan, tool operational requirements, and tool verification procedures - 1 + + 1 + + + + + + + + + + + + + + + + + A concrete software component @@ -780,8 +710,9 @@ - 1 + + 1 @@ -790,83 +721,36 @@ model of invariant detected by Daikon - - - person or DevOps invoking the tool - - + + + + + consist of multiple documents + + - - - - - - - - - - + + + + + + + entity impacting the property definition - e.g. SystemconOps - + - - Daikon tool invocation - Randoop tool - Text2Test tool usage instance - using Text2Test tool on a requirement set that generates Sally input model - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - author(s) of system architecture - - - - - - - - - author(s) of ConOps - organizations, persons - - + + + @@ -880,43 +764,16 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - @@ -926,87 +783,28 @@ - - - a hazard (if any) the property mitigates; GenericProperty typically doesn't mitigate any specific hazard - - + + + - - file containing tests in format of test vectors - - - - - - 1 - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - + + + - - - - 1 - - - - - - - - 1 - - - - - - - - 1 - - - - - - + @@ -1015,99 +813,6 @@ - - consist of multiple documents - - - - - - - - - - entity impacting the property definition - e.g. SystemconOps - - - - - - - - - - the tool that is invoked - - - - - - - - - - entity(ies) over which this property must hold; e.g., a model, a requirement set, code, etc. - - - - - SpecificProperty or GenericProperty that is the objective of analysis - - - - - - - - - - - - - - - - - - - - - - - - - - organization qualifying this tool - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1144,25 +849,6 @@ - - counter examples, other diagnostics - - - - - - - - - property objective: e.g., 'architecture is conformant', 'requirements are consistent', 'code is free of runtime errors, etc. - - - - - concise description of tool function, inputs, outputs - - - the likely invariant text @@ -1173,21 +859,6 @@ - - test environment description, configuration parameters - - - - - - 1 - - - - - - part (subclause) of the requirement this test oracle tests @@ -1216,11 +887,6 @@ - - all parameters/options used to run the tool - - - diff --git a/STR-Ontology/OwlModels/STR.owl b/STR-Ontology/OwlModels/STR.owl index 508dd934..7a09e43b 100644 --- a/STR-Ontology/OwlModels/STR.owl +++ b/STR-Ontology/OwlModels/STR.owl @@ -1,6 +1,9 @@ - 1 + + 1 diff --git a/sadl-examples/Example.sadl b/sadl-examples/Example.sadl index 2e2b7eaa..cc9244bd 100644 --- a/sadl-examples/Example.sadl +++ b/sadl-examples/Example.sadl @@ -102,7 +102,7 @@ DefineRequirements ExplanatoryRequirement (note "The requirement to produce a tutorial.") is a REQUIREMENT - createdBy DefineRequirements + wasGeneratedBy DefineRequirements dataInsertedBy WriteSomeSadl description "Help RACK users understand the difference between diff --git a/sadl-examples/Magic.sadl b/sadl-examples/Magic.sadl new file mode 100644 index 00000000..910b61d8 --- /dev/null +++ b/sadl-examples/Magic.sadl @@ -0,0 +1,13 @@ +uri "http://glguy.net/magic". + + +C is a class + described by rel with values of type C. +X is a type of C. +Y is a type of C. + +rel of C only has values of type {X or Y}. + +abool describes C with values of type boolean. + +I is a C abool false. \ No newline at end of file diff --git a/sadl-examples/RequirementAnalysisExample.sadl b/sadl-examples/RequirementAnalysisExample.sadl index b700ead0..7e989f44 100644 --- a/sadl-examples/RequirementAnalysisExample.sadl +++ b/sadl-examples/RequirementAnalysisExample.sadl @@ -29,7 +29,7 @@ RAE_CHECK is a type of THING. /* This goes in the data */ -ASSERT-RAE is a ENTITY. +ASSERT-RAE is a TOOL. russell-d-e is a PERSON. /*********************************************** * REQUIREMENTS and DATA_DICTIONARY diff --git a/sadl-examples/ShellCheckAnalysisExample.sadl b/sadl-examples/ShellCheckAnalysisExample.sadl index 686ee743..e64f47f1 100644 --- a/sadl-examples/ShellCheckAnalysisExample.sadl +++ b/sadl-examples/ShellCheckAnalysisExample.sadl @@ -51,6 +51,9 @@ ShellCheckExecutable hashType SHA1 hashValue "1d5bb912481c4510e3e0a3896a4896d64b55d983"). +ShellCheck is a TOOL + definedIn ShellCheckExecutable. + /* Shell check defines many checks, these are a few * https://gist.github.com/eggplants/9fbe03453c3f3fd03295e88def6a1324#file-_shellcheck-csv */ @@ -111,7 +114,7 @@ ExampleSh (note "A shell script available at https://github.com/koalaman/shellch RunShellCheckOnExampleSh is an SHELLCHECK_INVOCATION scCheckSourced true - analyzedWith ShellCheckExecutable + analyzedWith ShellCheck analysisInput ExampleSh wasAssociatedWith EricMertens startedAtTime "2021-08-17T23:00:00Z"