From 65d948e2d7c054e26c8ead389a617ea70c1e02dc Mon Sep 17 00:00:00 2001
From: Simon Trapp <Simon@10.107.27.12>
Date: Tue, 12 Nov 2019 14:20:23 +0100
Subject: [PATCH] fix mwc
---
.../Scenario_MWC_FG/DML-Model/min.repository | 45 +++++++++----------
.../Scenario_MWC_FG/DQL-Queries/Analysis.dql | 42 +++++++++--------
2 files changed, 41 insertions(+), 46 deletions(-)
diff --git a/dml-examples/Scenario_MWC_FG/DML-Model/min.repository b/dml-examples/Scenario_MWC_FG/DML-Model/min.repository
index 22010a1..4d6b851 100644
--- a/dml-examples/Scenario_MWC_FG/DML-Model/min.repository
+++ b/dml-examples/Scenario_MWC_FG/DML-Model/min.repository
@@ -48,32 +48,29 @@
<fineGrainedBehavior describedSignature="_49OlcAFjEeq06dmsv2l6pA" interfaceProvidingRole="_SHb3MO2bEeib_P5jAe7dPw">
<behavior>
<actions xsi:type="servicebehavior:InternalAction">
- <resourceDemand id="_EiBloAIlEeqJ55W0svXqzQ">
+ <resourceDemand id="_EiBloAIlEeqJ55W0svXqzQ" characterization="EXPLICIT">
<explicitDescription>
<probFunction xsi:type="functions:DoubleLiteral" value="30"/>
</explicitDescription>
<resourceType xsi:type="resourcetype:ProcessingResourceType" href="pathmap://DML_APPLICATIONLEVEL_MODELS/defaultresourcetypes.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
</resourceDemand>
</actions>
- <actions xsi:type="servicebehavior:BranchAction">
- <branches>
- <actions xsi:type="servicebehavior:ExternalCallAction">
- <externalCall id="_M_cd4AIlEeqJ55W0svXqzQ" name="ToB2" signature="_89HicAFjEeq06dmsv2l6pA" interfaceRequiringRole="_S0bgEe2bEeib_P5jAe7dPw"/>
- </actions>
- </branches>
- <branches>
- <actions xsi:type="servicebehavior:ExternalCallAction">
- <externalCall id="_eWLgMQIlEeqJ55W0svXqzQ" name="ToB2" signature="_89HicAFjEeq06dmsv2l6pA" interfaceRequiringRole="_S0bgEe2bEeib_P5jAe7dPw"/>
- </actions>
+ <actions xsi:type="servicebehavior:LoopAction">
+ <loopBodyBehavior>
<actions xsi:type="servicebehavior:ExternalCallAction">
- <externalCall id="_fvXgsQIlEeqJ55W0svXqzQ" name="ToB2" signature="_89HicAFjEeq06dmsv2l6pA" interfaceRequiringRole="_S0bgEe2bEeib_P5jAe7dPw"/>
+ <externalCall id="_ErHjEQVNEeqjVqeLxJ7bvw" name="ToB2" signature="_89HicAFjEeq06dmsv2l6pA" interfaceRequiringRole="_S0bgEe2bEeib_P5jAe7dPw"/>
</actions>
- </branches>
- <branchProbabilities id="_gc2RwAIlEeqJ55W0svXqzQ">
+ </loopBodyBehavior>
+ <loopIterationCount id="_F9GIUAVNEeqjVqeLxJ7bvw" characterization="EXPLICIT">
<explicitDescription>
- <probFunction xsi:type="functions:DoubleLiteral" value="0.5"/>
+ <probFunction xsi:type="functions:ProbabilityMassFunction">
+ <samples xsi:type="functions:IntSampleList">
+ <items probability="0.5" value="1"/>
+ <items probability="0.5" value="2"/>
+ </samples>
+ </probFunction>
</explicitDescription>
- </branchProbabilities>
+ </loopIterationCount>
</actions>
</behavior>
</fineGrainedBehavior>
@@ -103,7 +100,7 @@
<fineGrainedBehavior describedSignature="_89HicAFjEeq06dmsv2l6pA" interfaceProvidingRole="_oTaxMO2bEeib_P5jAe7dPw">
<behavior>
<actions xsi:type="servicebehavior:InternalAction">
- <resourceDemand id="_xKIucAIlEeqJ55W0svXqzQ">
+ <resourceDemand id="_xKIucAIlEeqJ55W0svXqzQ" characterization="EXPLICIT">
<explicitDescription>
<probFunction xsi:type="functions:ExponentialDistribution" rate="0.066666666"/>
</explicitDescription>
@@ -149,7 +146,7 @@
<fineGrainedBehavior describedSignature="_-Y0rcAFjEeq06dmsv2l6pA" interfaceProvidingRole="_7gZjcO2bEeib_P5jAe7dPw">
<behavior>
<actions xsi:type="servicebehavior:InternalAction">
- <resourceDemand id="_Zod-cAImEeqJ55W0svXqzQ">
+ <resourceDemand id="_Zod-cAImEeqJ55W0svXqzQ" characterization="EXPLICIT">
<explicitDescription>
<probFunction xsi:type="functions:NormalDistribution" mu="20" sigma="1"/>
</explicitDescription>
@@ -157,7 +154,7 @@
</resourceDemand>
</actions>
<actions xsi:type="servicebehavior:ExternalCallAction">
- <externalCall id="_iicP0AImEeqJ55W0svXqzQ" name="ToD" signature="_I6TZQ-2bEeib_P5jAe7dPw" interfaceRequiringRole="_674hIe2bEeib_P5jAe7dPw"/>
+ <externalCall id="_iicP0AImEeqJ55W0svXqzQ" name="ToD1" signature="_I6TZQ-2bEeib_P5jAe7dPw" interfaceRequiringRole="_674hIe2bEeib_P5jAe7dPw"/>
</actions>
<actions xsi:type="servicebehavior:ExternalCallAction">
<externalCall id="_lJOE0AImEeqJ55W0svXqzQ" name="ToD2" signature="_yTRWMAIkEeqJ55W0svXqzQ" interfaceRequiringRole="_674hIe2bEeib_P5jAe7dPw"/>
@@ -182,7 +179,7 @@
<fineGrainedBehavior describedSignature="_yTRWMAIkEeqJ55W0svXqzQ" interfaceProvidingRole="_uP8vIO2dEeib_P5jAe7dPw">
<behavior>
<actions xsi:type="servicebehavior:InternalAction">
- <resourceDemand id="_qtMDsAImEeqJ55W0svXqzQ">
+ <resourceDemand id="_qtMDsAImEeqJ55W0svXqzQ" characterization="EXPLICIT">
<explicitDescription>
<probFunction xsi:type="functions:ExponentialDistribution" rate="0.1"/>
</explicitDescription>
@@ -217,7 +214,7 @@
<fineGrainedBehavior describedSignature="_0IbhAAIkEeqJ55W0svXqzQ" interfaceProvidingRole="_6wgFoO2dEeib_P5jAe7dPw">
<behavior>
<actions xsi:type="servicebehavior:InternalAction">
- <resourceDemand id="_07Wg0AImEeqJ55W0svXqzQ">
+ <resourceDemand id="_07Wg0AImEeqJ55W0svXqzQ" characterization="EXPLICIT">
<explicitDescription>
<probFunction xsi:type="functions:ExponentialDistribution" rate="0.2"/>
</explicitDescription>
@@ -228,10 +225,10 @@
<externalCall id="_4JXU8AImEeqJ55W0svXqzQ" name="ToF2" signature="_1d3C4AIkEeqJ55W0svXqzQ" interfaceRequiringRole="_7K9NAe2dEeib_P5jAe7dPw"/>
</actions>
<actions xsi:type="servicebehavior:ExternalCallAction">
- <externalCall id="_8d9WoAImEeqJ55W0svXqzQ" name="ToG" signature="_JqhVQ-2bEeib_P5jAe7dPw" interfaceRequiringRole="_7nafge2dEeib_P5jAe7dPw"/>
+ <externalCall id="_8d9WoAImEeqJ55W0svXqzQ" name="ToG1" signature="_JqhVQ-2bEeib_P5jAe7dPw" interfaceRequiringRole="_7nafge2dEeib_P5jAe7dPw"/>
</actions>
<actions xsi:type="servicebehavior:ExternalCallAction">
- <externalCall id="_-xSrMAImEeqJ55W0svXqzQ" name="ToG" signature="_JqhVQ-2bEeib_P5jAe7dPw" interfaceRequiringRole="_7nafge2dEeib_P5jAe7dPw"/>
+ <externalCall id="_-xSrMAImEeqJ55W0svXqzQ" name="ToG2" signature="_JqhVQ-2bEeib_P5jAe7dPw" interfaceRequiringRole="_7nafge2dEeib_P5jAe7dPw"/>
</actions>
</behavior>
</fineGrainedBehavior>
@@ -272,7 +269,7 @@
<fineGrainedBehavior describedSignature="_1d3C4AIkEeqJ55W0svXqzQ" interfaceProvidingRole="_S_LQIO2eEeib_P5jAe7dPw">
<behavior>
<actions xsi:type="servicebehavior:InternalAction">
- <resourceDemand id="_Fho9oAInEeqJ55W0svXqzQ">
+ <resourceDemand id="_Fho9oAInEeqJ55W0svXqzQ" characterization="EXPLICIT">
<explicitDescription>
<probFunction xsi:type="functions:NormalDistribution" mu="40" sigma="2"/>
</explicitDescription>
diff --git a/dml-examples/Scenario_MWC_FG/DQL-Queries/Analysis.dql b/dml-examples/Scenario_MWC_FG/DQL-Queries/Analysis.dql
index d5a5dfd..f44dd4f 100644
--- a/dml-examples/Scenario_MWC_FG/DQL-Queries/Analysis.dql
+++ b/dml-examples/Scenario_MWC_FG/DQL-Queries/Analysis.dql
@@ -2,36 +2,34 @@ SELECT usageToA1.avgResponseTime, usageToA2.avgResponseTime, ToB.avgResponseTime
//CONSTRAINED AS 'USE_STATISTICAL_MODEL:A:A2'
EVALUATE DOF
VARYING 'ExponentialDistribution of OpenWorkload with ID _yiEmIEeqEeSW4Op0B0CyhQ' <0.005>//, 0.010, 0.015, 0.020, 0.025>//, 0.030>
-FOR SERVICE '_yiFNMEeqEeSW4Op0B0CyhQ' AS WC1,
- SERVICE '_A_DeMEmxEeOPLK3yYyEQWQ' AS usageToA1,
- SERVICE '_o2LXcAFlEeq06dmsv2l6pA' AS usageToA2,
+FOR SERVICE '_o2LXcAFlEeq06dmsv2l6pA' AS usageToA2,
SERVICE '_o2KwYAFlEeq06dmsv2l6pA' AS WC2,
- SERVICE '_fvXgsQIlEeqJ55W0svXqzQ' AS ToB2,
- SERVICE '_3Nfj0O2bEeib_P5jAe7dPw' AS ToE,
+ SERVICE '_yiFNMEeqEeSW4Op0B0CyhQ' AS WC1,
+ SERVICE '_A_DeMEmxEeOPLK3yYyEQWQ' AS usageToA1,
+ SERVICE '_8d9WoAImEeqJ55W0svXqzQ' AS ToG1,
SERVICE '_PVKcgO2eEeib_P5jAe7dPw' AS ToG,
- SERVICE '_KZ6woAImEeqJ55W0svXqzQ' AS ToE2,
SERVICE '_Gwyt0AImEeqJ55W0svXqzQ' AS ToC2,
- SERVICE '_lJOE0AImEeqJ55W0svXqzQ' AS ToD2,
- SERVICE '_iicP0AImEeqJ55W0svXqzQ' AS ToD,
- SERVICE '_-xSrMAImEeqJ55W0svXqzQ' AS ToG,
- SERVICE '_1XjV4O2bEeib_P5jAe7dPw' AS ToC,
- SERVICE '_8d9WoAImEeqJ55W0svXqzQ' AS ToG,
- SERVICE '_M_cd4AIlEeqJ55W0svXqzQ' AS ToB2,
+ SERVICE '_iicP0AImEeqJ55W0svXqzQ' AS ToD1,
+ SERVICE '_3Nfj0O2bEeib_P5jAe7dPw' AS ToE,
+ SERVICE '_NSR-wO2eEeib_P5jAe7dPw' AS ToF,
SERVICE '_4JXU8AImEeqJ55W0svXqzQ' AS ToF2,
+ SERVICE '_1XjV4O2bEeib_P5jAe7dPw' AS ToC,
SERVICE '_W7bVMO2cEeib_P5jAe7dPw' AS ToD,
- SERVICE '_eWLgMQIlEeqJ55W0svXqzQ' AS ToB2,
+ SERVICE '_lJOE0AImEeqJ55W0svXqzQ' AS ToD2,
+ SERVICE '_ErHjEQVNEeqjVqeLxJ7bvw' AS ToB2,
+ SERVICE '_-xSrMAImEeqJ55W0svXqzQ' AS ToG2,
SERVICE '_jPXogO2bEeib_P5jAe7dPw' AS ToB,
- SERVICE '_NSR-wO2eEeib_P5jAe7dPw' AS ToF,
- RESOURCE '_WjRMhO2fEeib_P5jAe7dPw' AS CPC_CPU,
- RESOURCE '_6JPywPMLEeiRdfQDBIGrTA' AS CPB_Network,
- RESOURCE '_7nRP8vMLEeiRdfQDBIGrTA' AS CPFG_Network,
+ SERVICE '_KZ6woAImEeqJ55W0svXqzQ' AS ToE2,
RESOURCE '_I3tj4EnuEeOWVc_o6w1CBw' AS CPA_CPU,
- RESOURCE '_6uWD4vMLEeiRdfQDBIGrTA' AS CPD_Network,
+ RESOURCE '_We1_hO2fEeib_P5jAe7dPw' AS CPB_CPU,
RESOURCE '_W2LhdO2fEeib_P5jAe7dPw' AS CPE_CPU,
+ RESOURCE '_6JPywPMLEeiRdfQDBIGrTA' AS CPB_Network,
RESOURCE '_6aFrIvMLEeiRdfQDBIGrTA' AS CPC_Network,
- RESOURCE '_Wr9OdO2fEeib_P5jAe7dPw' AS CPD_CPU,
- RESOURCE '_We1_hO2fEeib_P5jAe7dPw' AS CPB_CPU,
- RESOURCE '_yS7WwfMLEeiRdfQDBIGrTA' AS CPA_Network,
RESOURCE '_7J0e8vMLEeiRdfQDBIGrTA' AS CPE_Network,
- RESOURCE '_W9C-dO2fEeib_P5jAe7dPw' AS CPFG_CPU
+ RESOURCE '_W9C-dO2fEeib_P5jAe7dPw' AS CPFG_CPU,
+ RESOURCE '_WjRMhO2fEeib_P5jAe7dPw' AS CPC_CPU,
+ RESOURCE '_yS7WwfMLEeiRdfQDBIGrTA' AS CPA_Network,
+ RESOURCE '_Wr9OdO2fEeib_P5jAe7dPw' AS CPD_CPU,
+ RESOURCE '_7nRP8vMLEeiRdfQDBIGrTA' AS CPFG_Network,
+ RESOURCE '_6uWD4vMLEeiRdfQDBIGrTA' AS CPD_Network
USING dml@'minmodel.properties';
\ No newline at end of file
--
GitLab