From 11b9f7b9bd4ea90c4ad67d9f4fc2e8615ae6a8c5 Mon Sep 17 00:00:00 2001 From: "Kirschner, Yves (IPD)" Date: Thu, 10 Dec 2020 17:36:07 +0100 Subject: [PATCH 1/4] fixed design decisions namespace and update models to renamed quality namespace and pcm 5.2 --- .../InvalidComponentParameter.quality | 2 +- .../ValidComponentParameter.quality | 2 +- InfrastructureComponent_Example/ValidParameterInterval.quality | 2 +- InfrastructureComponent_Example/ValidParameterRange.quality | 2 +- .../ValidReturnParameterRange.quality | 2 +- ...imple Example DSE No ProcRate predefined all.designdecision | 3 ++- .../Simple Example DSE No ProcRate.designdecision | 2 +- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/InfrastructureComponent_Example/InvalidComponentParameter.quality b/InfrastructureComponent_Example/InvalidComponentParameter.quality index 9d1743c..ab1c243 100755 --- a/InfrastructureComponent_Example/InvalidComponentParameter.quality +++ b/InfrastructureComponent_Example/InvalidComponentParameter.quality @@ -1,5 +1,5 @@ - + diff --git a/InfrastructureComponent_Example/ValidComponentParameter.quality b/InfrastructureComponent_Example/ValidComponentParameter.quality index ea3e3aa..55e1c95 100755 --- a/InfrastructureComponent_Example/ValidComponentParameter.quality +++ b/InfrastructureComponent_Example/ValidComponentParameter.quality @@ -1,5 +1,5 @@ - + diff --git a/InfrastructureComponent_Example/ValidParameterInterval.quality b/InfrastructureComponent_Example/ValidParameterInterval.quality index 3217051..43bd8f1 100755 --- a/InfrastructureComponent_Example/ValidParameterInterval.quality +++ b/InfrastructureComponent_Example/ValidParameterInterval.quality @@ -1,5 +1,5 @@ - + diff --git a/InfrastructureComponent_Example/ValidParameterRange.quality b/InfrastructureComponent_Example/ValidParameterRange.quality index aa1996f..d97cf75 100755 --- a/InfrastructureComponent_Example/ValidParameterRange.quality +++ b/InfrastructureComponent_Example/ValidParameterRange.quality @@ -1,5 +1,5 @@ - + diff --git a/InfrastructureComponent_Example/ValidReturnParameterRange.quality b/InfrastructureComponent_Example/ValidReturnParameterRange.quality index c42d62a..28e544a 100755 --- a/InfrastructureComponent_Example/ValidReturnParameterRange.quality +++ b/InfrastructureComponent_Example/ValidReturnParameterRange.quality @@ -1,5 +1,5 @@ - + diff --git a/SimpleOptimisation_Example/Simple Example DSE No ProcRate predefined all.designdecision b/SimpleOptimisation_Example/Simple Example DSE No ProcRate predefined all.designdecision index cd77cfb..b30b3d6 100644 --- a/SimpleOptimisation_Example/Simple Example DSE No ProcRate predefined all.designdecision +++ b/SimpleOptimisation_Example/Simple Example DSE No ProcRate predefined all.designdecision @@ -1,5 +1,6 @@ - + + diff --git a/SimpleOptimisation_Example/Simple Example DSE No ProcRate.designdecision b/SimpleOptimisation_Example/Simple Example DSE No ProcRate.designdecision index a4d4c0b..07b6d0e 100644 --- a/SimpleOptimisation_Example/Simple Example DSE No ProcRate.designdecision +++ b/SimpleOptimisation_Example/Simple Example DSE No ProcRate.designdecision @@ -1,5 +1,5 @@ - + From 93dae8e189f9c5d8e2b46ca005c8fbdd522a1a71 Mon Sep 17 00:00:00 2001 From: "Kirschner, Yves (IPD)" Date: Thu, 10 Dec 2020 17:50:45 +0100 Subject: [PATCH 2/4] Import the changes from https://github.com/PalladioSimulator/Palladio-Example-Models/tree/fixNS --- InfrastructureComponent_Example/ValidParameterInterval.quality | 2 +- ...Simple Example DSE No ProcRate predefined all.designdecision | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/InfrastructureComponent_Example/ValidParameterInterval.quality b/InfrastructureComponent_Example/ValidParameterInterval.quality index 43bd8f1..39d4493 100755 --- a/InfrastructureComponent_Example/ValidParameterInterval.quality +++ b/InfrastructureComponent_Example/ValidParameterInterval.quality @@ -1,5 +1,5 @@ - + diff --git a/SimpleOptimisation_Example/Simple Example DSE No ProcRate predefined all.designdecision b/SimpleOptimisation_Example/Simple Example DSE No ProcRate predefined all.designdecision index b30b3d6..07b6d0e 100644 --- a/SimpleOptimisation_Example/Simple Example DSE No ProcRate predefined all.designdecision +++ b/SimpleOptimisation_Example/Simple Example DSE No ProcRate predefined all.designdecision @@ -1,6 +1,5 @@ - From 0c26cd59d3433021edc5f0b067c2751bc5deb456 Mon Sep 17 00:00:00 2001 From: "Kirschner, Yves (IPD)" Date: Thu, 10 Dec 2020 17:54:24 +0100 Subject: [PATCH 3/4] fixed design decisions ns --- ... No ProcRate predefined all.designdecision | 118 +++++++++--------- ...ple Example DSE No ProcRate.designdecision | 118 +++++++++--------- 2 files changed, 118 insertions(+), 118 deletions(-) diff --git a/SimpleOptimisation_Example/Simple Example DSE No ProcRate predefined all.designdecision b/SimpleOptimisation_Example/Simple Example DSE No ProcRate predefined all.designdecision index 07b6d0e..5d92997 100644 --- a/SimpleOptimisation_Example/Simple Example DSE No ProcRate predefined all.designdecision +++ b/SimpleOptimisation_Example/Simple Example DSE No ProcRate predefined all.designdecision @@ -1,73 +1,73 @@ - + - - - + + + - - - + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/SimpleOptimisation_Example/Simple Example DSE No ProcRate.designdecision b/SimpleOptimisation_Example/Simple Example DSE No ProcRate.designdecision index 07b6d0e..3b759a6 100644 --- a/SimpleOptimisation_Example/Simple Example DSE No ProcRate.designdecision +++ b/SimpleOptimisation_Example/Simple Example DSE No ProcRate.designdecision @@ -1,73 +1,73 @@ - + - - - + + + - - - + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + From 0c9c65e1d71426a9473ea59dcc01b6f02663fc96 Mon Sep 17 00:00:00 2001 From: "Kirschner, Yves (IPD)" Date: Thu, 10 Dec 2020 17:55:45 +0100 Subject: [PATCH 4/4] update models to renamed quality namespace and pcm 5.2 --- .../InvalidComponentParameter.quality | 116 ++++++++++-------- .../ValidComponentParameter.quality | 116 ++++++++++-------- .../ValidParameterInterval.quality | 107 +++++++++------- .../ValidParameterRange.quality | 107 +++++++++------- .../ValidReturnParameterRange.quality | 107 +++++++++------- 5 files changed, 317 insertions(+), 236 deletions(-) diff --git a/InfrastructureComponent_Example/InvalidComponentParameter.quality b/InfrastructureComponent_Example/InvalidComponentParameter.quality index ab1c243..309b8ee 100755 --- a/InfrastructureComponent_Example/InvalidComponentParameter.quality +++ b/InfrastructureComponent_Example/InvalidComponentParameter.quality @@ -1,79 +1,97 @@ - - - - - - - + + + + + + + + + - - - - + + + + - - - - + + + + - - - + + + + + + - - - - - - + + + + + + + + - - - - - - + + + + + + + + - - - - - - + + + + + + + + - - - + + + + + - - - - - - + + + + + + + + - - - + + + + + + - + diff --git a/InfrastructureComponent_Example/ValidComponentParameter.quality b/InfrastructureComponent_Example/ValidComponentParameter.quality index 55e1c95..91f8686 100755 --- a/InfrastructureComponent_Example/ValidComponentParameter.quality +++ b/InfrastructureComponent_Example/ValidComponentParameter.quality @@ -1,79 +1,97 @@ - - - - - - - + + + + + + + + + - - - - + + + + - - - - + + + + - - - + + + + + + - - - - - - + + + + + + + + - - - - - - + + + + + + + + - - - - - - + + + + + + + + - - - + + + + + - - - - - - + + + + + + + + - - - + + + + + + - + diff --git a/InfrastructureComponent_Example/ValidParameterInterval.quality b/InfrastructureComponent_Example/ValidParameterInterval.quality index 39d4493..c975adf 100755 --- a/InfrastructureComponent_Example/ValidParameterInterval.quality +++ b/InfrastructureComponent_Example/ValidParameterInterval.quality @@ -1,73 +1,88 @@ - - - - - - - + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + + + - - - - - - + + + + + + + + - - - - - - + + + + + + + + - - - + + + + + - - - - - - + + + + + + + + - - - + + + + + + - + diff --git a/InfrastructureComponent_Example/ValidParameterRange.quality b/InfrastructureComponent_Example/ValidParameterRange.quality index d97cf75..358722b 100755 --- a/InfrastructureComponent_Example/ValidParameterRange.quality +++ b/InfrastructureComponent_Example/ValidParameterRange.quality @@ -1,55 +1,65 @@ - - - - - - - + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + + + - - - - - - + + + + + + + + - - - - - - + + + + + + + + - - - + + + + + @@ -57,19 +67,24 @@ - - - - - - + + + + + + + + - - - + + + + + + - + diff --git a/InfrastructureComponent_Example/ValidReturnParameterRange.quality b/InfrastructureComponent_Example/ValidReturnParameterRange.quality index 28e544a..822524c 100755 --- a/InfrastructureComponent_Example/ValidReturnParameterRange.quality +++ b/InfrastructureComponent_Example/ValidReturnParameterRange.quality @@ -1,73 +1,88 @@ - - - - - - - + + + + + + + + + - - - - + + + + - - - - + + + + - - - + + + + + + - - - - - - + + + + + + + + - - - - - - + + + + + + + + - - - - - - + + + + + + + + - - - + + + + + - - - - - - + + + + + + + + - +