From f51d8f7e7666081db47d86889b435fb2f3a83d9f Mon Sep 17 00:00:00 2001 From: Mike Surridge <27415349+mike1813@users.noreply.github.com> Date: Sat, 29 Jun 2024 16:53:02 +0100 Subject: [PATCH] Issue #149: fixed bug in construction pattern DSDPS+DC. --- csv/RiskLookupTable.csv | 76 ++++++++++++++++++++-------------------- csv/RootPatternLinks.csv | 2 -- csv/RootPatternNodes.csv | 1 - 3 files changed, 38 insertions(+), 41 deletions(-) diff --git a/csv/RiskLookupTable.csv b/csv/RiskLookupTable.csv index f835019..29b4147 100644 --- a/csv/RiskLookupTable.csv +++ b/csv/RiskLookupTable.csv @@ -1,38 +1,38 @@ -IV,LV,package,impactLevel,likelihoodLevel,riskLevel,RV -0,0,domain#000000,domain#ImpactLevelNegligible,domain#Negligible,domain#RiskLevelVeryLow,0 -0,0,package#Core,domain#ImpactLevelNegligible,domain#Negligible,domain#RiskLevelVeryLow,0 -0,1,package#Core,domain#ImpactLevelNegligible,domain#LikelihoodVeryLow,domain#RiskLevelVeryLow,0 -0,2,package#Core,domain#ImpactLevelNegligible,domain#LikelihoodLow,domain#RiskLevelVeryLow,0 -0,3,package#Core,domain#ImpactLevelNegligible,domain#LikelihoodMedium,domain#RiskLevelVeryLow,0 -0,4,package#Core,domain#ImpactLevelNegligible,domain#LikelihoodHigh,domain#RiskLevelVeryLow,0 -0,5,package#Core,domain#ImpactLevelNegligible,domain#LikelihoodVeryHigh,domain#RiskLevelVeryLow,0 -1,0,package#Core,domain#ImpactLevelVeryLow,domain#Negligible,domain#RiskLevelVeryLow,0 -1,1,package#Core,domain#ImpactLevelVeryLow,domain#LikelihoodVeryLow,domain#RiskLevelVeryLow,0 -1,2,package#Core,domain#ImpactLevelVeryLow,domain#LikelihoodLow,domain#RiskLevelVeryLow,0 -1,3,package#Core,domain#ImpactLevelVeryLow,domain#LikelihoodMedium,domain#RiskLevelVeryLow,0 -1,4,package#Core,domain#ImpactLevelVeryLow,domain#LikelihoodHigh,domain#RiskLevelLow,1 -1,5,package#Core,domain#ImpactLevelVeryLow,domain#LikelihoodVeryHigh,domain#RiskLevelLow,1 -2,0,package#Core,domain#ImpactLevelLow,domain#Negligible,domain#RiskLevelVeryLow,0 -2,1,package#Core,domain#ImpactLevelLow,domain#LikelihoodVeryLow,domain#RiskLevelVeryLow,0 -2,2,package#Core,domain#ImpactLevelLow,domain#LikelihoodLow,domain#RiskLevelVeryLow,0 -2,3,package#Core,domain#ImpactLevelLow,domain#LikelihoodMedium,domain#RiskLevelLow,1 -2,4,package#Core,domain#ImpactLevelLow,domain#LikelihoodHigh,domain#RiskLevelLow,1 -2,5,package#Core,domain#ImpactLevelLow,domain#LikelihoodVeryHigh,domain#RiskLevelMedium,2 -3,0,package#Core,domain#ImpactLevelMedium,domain#Negligible,domain#RiskLevelVeryLow,0 -3,1,package#Core,domain#ImpactLevelMedium,domain#LikelihoodVeryLow,domain#RiskLevelVeryLow,0 -3,2,package#Core,domain#ImpactLevelMedium,domain#LikelihoodLow,domain#RiskLevelLow,1 -3,3,package#Core,domain#ImpactLevelMedium,domain#LikelihoodMedium,domain#RiskLevelMedium,2 -3,4,package#Core,domain#ImpactLevelMedium,domain#LikelihoodHigh,domain#RiskLevelHigh,3 -3,5,package#Core,domain#ImpactLevelMedium,domain#LikelihoodVeryHigh,domain#RiskLevelHigh,3 -4,0,package#Core,domain#ImpactLevelHigh,domain#Negligible,domain#RiskLevelVeryLow,0 -4,1,package#Core,domain#ImpactLevelHigh,domain#LikelihoodVeryLow,domain#RiskLevelLow,1 -4,2,package#Core,domain#ImpactLevelHigh,domain#LikelihoodLow,domain#RiskLevelMedium,2 -4,3,package#Core,domain#ImpactLevelHigh,domain#LikelihoodMedium,domain#RiskLevelHigh,3 -4,4,package#Core,domain#ImpactLevelHigh,domain#LikelihoodHigh,domain#RiskLevelVeryHigh,4 -4,5,package#Core,domain#ImpactLevelHigh,domain#LikelihoodVeryHigh,domain#RiskLevelVeryHigh,4 -5,0,package#Core,domain#ImpactLevelVeryHigh,domain#Negligible,domain#RiskLevelVeryLow,0 -5,1,package#Core,domain#ImpactLevelVeryHigh,domain#LikelihoodVeryLow,domain#RiskLevelLow,1 -5,2,package#Core,domain#ImpactLevelVeryHigh,domain#LikelihoodLow,domain#RiskLevelMedium,2 -5,3,package#Core,domain#ImpactLevelVeryHigh,domain#LikelihoodMedium,domain#RiskLevelHigh,3 -5,4,package#Core,domain#ImpactLevelVeryHigh,domain#LikelihoodHigh,domain#RiskLevelVeryHigh,4 -5,5,package#Core,domain#ImpactLevelVeryHigh,domain#LikelihoodVeryHigh,domain#RiskLevelVeryHigh,4 \ No newline at end of file +IV,LV,package,impactLevel,likelihoodLevel,riskLevel,RV +0,0,domain#000000,domain#ImpactLevelNegligible,domain#Negligible,domain#RiskLevelVeryLow,0 +0,0,package#Core,domain#ImpactLevelNegligible,domain#Negligible,domain#RiskLevelVeryLow,0 +0,1,package#Core,domain#ImpactLevelNegligible,domain#LikelihoodVeryLow,domain#RiskLevelVeryLow,0 +0,2,package#Core,domain#ImpactLevelNegligible,domain#LikelihoodLow,domain#RiskLevelVeryLow,0 +0,3,package#Core,domain#ImpactLevelNegligible,domain#LikelihoodMedium,domain#RiskLevelVeryLow,0 +0,4,package#Core,domain#ImpactLevelNegligible,domain#LikelihoodHigh,domain#RiskLevelVeryLow,0 +0,5,package#Core,domain#ImpactLevelNegligible,domain#LikelihoodVeryHigh,domain#RiskLevelVeryLow,0 +1,0,package#Core,domain#ImpactLevelVeryLow,domain#Negligible,domain#RiskLevelVeryLow,0 +1,1,package#Core,domain#ImpactLevelVeryLow,domain#LikelihoodVeryLow,domain#RiskLevelVeryLow,0 +1,2,package#Core,domain#ImpactLevelVeryLow,domain#LikelihoodLow,domain#RiskLevelVeryLow,0 +1,3,package#Core,domain#ImpactLevelVeryLow,domain#LikelihoodMedium,domain#RiskLevelVeryLow,0 +1,4,package#Core,domain#ImpactLevelVeryLow,domain#LikelihoodHigh,domain#RiskLevelLow,1 +1,5,package#Core,domain#ImpactLevelVeryLow,domain#LikelihoodVeryHigh,domain#RiskLevelLow,1 +2,0,package#Core,domain#ImpactLevelLow,domain#Negligible,domain#RiskLevelVeryLow,0 +2,1,package#Core,domain#ImpactLevelLow,domain#LikelihoodVeryLow,domain#RiskLevelVeryLow,0 +2,2,package#Core,domain#ImpactLevelLow,domain#LikelihoodLow,domain#RiskLevelVeryLow,0 +2,3,package#Core,domain#ImpactLevelLow,domain#LikelihoodMedium,domain#RiskLevelLow,1 +2,4,package#Core,domain#ImpactLevelLow,domain#LikelihoodHigh,domain#RiskLevelLow,1 +2,5,package#Core,domain#ImpactLevelLow,domain#LikelihoodVeryHigh,domain#RiskLevelMedium,2 +3,0,package#Core,domain#ImpactLevelMedium,domain#Negligible,domain#RiskLevelVeryLow,0 +3,1,package#Core,domain#ImpactLevelMedium,domain#LikelihoodVeryLow,domain#RiskLevelVeryLow,0 +3,2,package#Core,domain#ImpactLevelMedium,domain#LikelihoodLow,domain#RiskLevelLow,1 +3,3,package#Core,domain#ImpactLevelMedium,domain#LikelihoodMedium,domain#RiskLevelMedium,2 +3,4,package#Core,domain#ImpactLevelMedium,domain#LikelihoodHigh,domain#RiskLevelHigh,3 +3,5,package#Core,domain#ImpactLevelMedium,domain#LikelihoodVeryHigh,domain#RiskLevelHigh,3 +4,0,package#Core,domain#ImpactLevelHigh,domain#Negligible,domain#RiskLevelVeryLow,0 +4,1,package#Core,domain#ImpactLevelHigh,domain#LikelihoodVeryLow,domain#RiskLevelLow,1 +4,2,package#Core,domain#ImpactLevelHigh,domain#LikelihoodLow,domain#RiskLevelMedium,2 +4,3,package#Core,domain#ImpactLevelHigh,domain#LikelihoodMedium,domain#RiskLevelHigh,3 +4,4,package#Core,domain#ImpactLevelHigh,domain#LikelihoodHigh,domain#RiskLevelVeryHigh,4 +4,5,package#Core,domain#ImpactLevelHigh,domain#LikelihoodVeryHigh,domain#RiskLevelVeryHigh,4 +5,0,package#Core,domain#ImpactLevelVeryHigh,domain#Negligible,domain#RiskLevelVeryLow,0 +5,1,package#Core,domain#ImpactLevelVeryHigh,domain#LikelihoodVeryLow,domain#RiskLevelLow,1 +5,2,package#Core,domain#ImpactLevelVeryHigh,domain#LikelihoodLow,domain#RiskLevelMedium,2 +5,3,package#Core,domain#ImpactLevelVeryHigh,domain#LikelihoodMedium,domain#RiskLevelHigh,3 +5,4,package#Core,domain#ImpactLevelVeryHigh,domain#LikelihoodHigh,domain#RiskLevelVeryHigh,4 +5,5,package#Core,domain#ImpactLevelVeryHigh,domain#LikelihoodVeryHigh,domain#RiskLevelVeryHigh,4 diff --git a/csv/RootPatternLinks.csv b/csv/RootPatternLinks.csv index 4e4d409..74a080b 100644 --- a/csv/RootPatternLinks.csv +++ b/csv/RootPatternLinks.csv @@ -985,8 +985,6 @@ package#DataLifecycleInference,domain#R-DSDDF,domain#Link-Data-containsField-Dat package#DataLifecycleInference,domain#R-DSDDF,domain#Link-DataCopy-copyOf-Data package#DataLifecycleInference,domain#R-DSDPS,domain#Link-DataAccess-isSource-Data package#DataLifecycleInference,domain#R-DSDPS,domain#Link-DataAccess-usedBy-Process -package#DataLifecycleInference,domain#R-DSDPS,domain#Link-DataDestination-isDest-Data -package#DataLifecycleInference,domain#R-DSDPS,domain#Link-DataDestination-usedBy-Service package#DataLifecycleInference,domain#R-DSDPS,domain#Link-DataPath-dataPathFor-Data package#DataLifecycleInference,domain#R-DSDPS,domain#Link-DataPath-fromProc-Process package#DataLifecycleInference,domain#R-DSDPS,domain#Link-DataPath-toProc-Service diff --git a/csv/RootPatternNodes.csv b/csv/RootPatternNodes.csv index 79b736d..ac6a2d5 100644 --- a/csv/RootPatternNodes.csv +++ b/csv/RootPatternNodes.csv @@ -961,7 +961,6 @@ package#DataLifecycleInference,domain#R-DSDDF,domain#Node-Data-Data,TRUE package#DataLifecycleInference,domain#R-DSDDF,domain#Node-DataField-DataField,TRUE package#DataLifecycleInference,domain#R-DSDPS,domain#Node-DataAccess-DataAccess,TRUE package#DataLifecycleInference,domain#R-DSDPS,domain#Node-Data-Data,TRUE -package#DataLifecycleInference,domain#R-DSDPS,domain#Node-DataDestination-DataAccess,TRUE package#DataLifecycleInference,domain#R-DSDPS,domain#Node-DataPath-DataPath,TRUE package#DataLifecycleInference,domain#R-DSDPS,domain#Node-Process-Process,TRUE package#DataLifecycleInference,domain#R-DSDPS,domain#Node-Service-Process,TRUE