diff --git a/RACK-Ontology/OwlModels/HAZARD.owl b/RACK-Ontology/OwlModels/HAZARD.owl index 996d0fa4..9912bfe3 100644 --- a/RACK-Ontology/OwlModels/HAZARD.owl +++ b/RACK-Ontology/OwlModels/HAZARD.owl @@ -21,8 +21,8 @@ - 1 + 1 @@ -30,8 +30,8 @@ - 1 + 1 @@ -39,8 +39,8 @@ - 1 + 1 diff --git a/RACK-Ontology/OwlModels/SYSTEM.owl b/RACK-Ontology/OwlModels/SYSTEM.owl index d60681b4..395edd34 100644 --- a/RACK-Ontology/OwlModels/SYSTEM.owl +++ b/RACK-Ontology/OwlModels/SYSTEM.owl @@ -21,8 +21,8 @@ - 1 + 1 diff --git a/RACK-Ontology/ontology/HAZARD.sadl b/RACK-Ontology/ontology/HAZARD.sadl index 0a1c8131..f9ea1756 100644 --- a/RACK-Ontology/ontology/HAZARD.sadl +++ b/RACK-Ontology/ontology/HAZARD.sadl @@ -38,11 +38,14 @@ HAZARD 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 a single value of type string. - - severity (note "the severity of the HAZARD") describes HAZARD with a single value of type float [0,1]. - - likelihood (note "probability value between 0 and 1") describes HAZARD with a single value of type float [0,1]. + effect (note "consequence(s) of the HAZARD") describes HAZARD with values of type string. + effect describes HAZARD with at most 1 value. + + severity (note "the severity of the HAZARD") describes HAZARD with values of type float [0,1]. + severity describes HAZARD with at most 1 value. + + likelihood (note "probability value between 0 and 1") describes HAZARD with values of type float [0,1]. + likelihood describes HAZARD with at most 1 value. // A Hazard can be mitigated by a requirement, operating procedure etc., mitigation by REQUIREMENT is defined in REQUIREMENTS.sadl. H:mitigates (note "a HAZARD may be mitigated by a OP_PROCEDURE") describes OP_PROCEDURE with values of type HAZARD. diff --git a/RACK-Ontology/ontology/SYSTEM.sadl b/RACK-Ontology/ontology/SYSTEM.sadl index a452b0ea..858c5a6d 100644 --- a/RACK-Ontology/ontology/SYSTEM.sadl +++ b/RACK-Ontology/ontology/SYSTEM.sadl @@ -66,9 +66,10 @@ FUNCTION (note "defines functionality / capability") is a type of ENTITY. - parentFunction (note "allows for decomposition of functionality") describes FUNCTION with a single value of type FUNCTION. - -OP_ENV + parentFunction (note "allows for decomposition of functionality") describes FUNCTION with values of type FUNCTION. + parentFunction describes FUNCTION with at most 1 value. + +OP_ENV (note "defines the operating environment assumptions and constraints") is a type of THING. // should this be an ENTITY?