diff --git a/RACK-Ontology/ontology/HAZARD.sadl b/RACK-Ontology/ontology/HAZARD.sadl index 70228ec0..9fe5bb92 100644 --- a/RACK-Ontology/ontology/HAZARD.sadl +++ b/RACK-Ontology/ontology/HAZARD.sadl @@ -30,9 +30,6 @@ HAZARD (note "HAZARD as identified by some HAZARD_IDENTIFICATION ACTIVITY, to be assessed for certification") is a type of ENTITY. - definition (note "Description of the HAZARD") describes HAZARD with values of type string. - definition describes HAZARD with at most 1 value. - 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. diff --git a/Turnstile-Example/Turnstile-IngestionPackage/HazardAssessment/HAZARD2.csv b/Turnstile-Example/Turnstile-IngestionPackage/HazardAssessment/HAZARD2.csv index ac482007..145e26de 100644 --- a/Turnstile-Example/Turnstile-IngestionPackage/HazardAssessment/HAZARD2.csv +++ b/Turnstile-Example/Turnstile-IngestionPackage/HazardAssessment/HAZARD2.csv @@ -1,4 +1,4 @@ -identifier,dataInsertedBy_identifier,definition,source_identifier,wasDerivedFrom_identifier +identifier,dataInsertedBy_identifier,description,source_identifier,wasDerivedFrom_identifier H-1,TurnstileIngestion-HazardAssessment,System Crash,Turnstile, H-1.1,TurnstileIngestion-HazardAssessment,Integer Under Flow,,H-1 H-1.2,TurnstileIngestion-HazardAssessment,Integer Over Flow,,H-1 diff --git a/Turnstile-Example/TurnstileDataCreation_HazardAssessment.py b/Turnstile-Example/TurnstileDataCreation_HazardAssessment.py index b911fcbf..eaec1a7c 100755 --- a/Turnstile-Example/TurnstileDataCreation_HazardAssessment.py +++ b/Turnstile-Example/TurnstileDataCreation_HazardAssessment.py @@ -30,19 +30,19 @@ def CreateCdrs(): Add.HAZARD(identifier="H-1", - definition="System Crash", + description="System Crash", source_identifier = "Turnstile") Add.HAZARD(identifier="H-1.1", - definition="Integer Under Flow", + description="Integer Under Flow", wasDerivedFrom_identifier = "H-1") Add.HAZARD(identifier="H-1.2", - definition="Integer Over Flow", + description="Integer Over Flow", wasDerivedFrom_identifier = "H-1") Add.HAZARD(identifier="H-2", - definition="Park Exceeds Capacity", + description="Park Exceeds Capacity", source_identifier = "Turnstile") createCDR("http://rack001/turnstiledata")