diff --git a/Examples/SEAMS_Case_Study/pushpull.adaptation b/Examples/SEAMS_Case_Study/pushpull.adaptation index 870e8619286c8c8f2646509c645e64dceb048033..6e72d72fed50eded044dda4243aea5d456f896ca 100644 --- a/Examples/SEAMS_Case_Study/pushpull.adaptation +++ b/Examples/SEAMS_Case_Study/pushpull.adaptation @@ -4,7 +4,7 @@ <implementedPlan id="qweqweqwe" name="AddResourcesAdaptationPlan"> <steps xsi:type="adaptation:StartAction" id="_PXgN0KaHEeKsaqdh-1smGw" successor="_Qych0qaHEeKsaqdh-1smGw"/> <steps xsi:type="adaptation:StopAction" id="_QNxHcaaHEeKsaqdh-1smGw" predecessor="_Qych0qaHEeKsaqdh-1smGw"/> - <steps xsi:type="adaptation:LoopAction" id="_Qych0qaHEeKsaqdh-1smGw" predecessor="_PXgN0KaHEeKsaqdh-1smGw" successor="_QNxHcaaHEeKsaqdh-1smGw" counter="1"> + <steps xsi:type="adaptation:LoopAction" id="_Qych0qaHEeKsaqdh-1smGw" predecessor="_PXgN0KaHEeKsaqdh-1smGw" successor="_QNxHcaaHEeKsaqdh-1smGw" counter="//@parameters.0"> <body id="_UpH4cKaHEeKsaqdh-1smGw" name="addVCPUorAppServer"> <steps xsi:type="adaptation:StartAction" id="2342623434" successor="33eadsea"/> <steps xsi:type="adaptation:BranchAction" id="33eadsea" predecessor="2342623434" successor="6423423423" condition="RuntimeEnvironment.allInstances()->select( re | re.template = self.template )->exists(re | re.configSpec.oclAsType(resourceconfiguration::ActiveResourceSpecification).processingResourceSpecifications->forAll(nrOfParProcUnits.number < 4)) and RuntimeEnvironment.allInstances()->select( re | re.template = self.template )->forAll(re | re.template.templateConfig.oclAsType(resourceconfiguration::ActiveResourceSpecification).processingResourceSpecifications->forAll(nrOfParProcUnits.number < 4))"> @@ -48,7 +48,7 @@ <implementedPlan id="123123123" name="RemoveResourcesAdaptationPlan"> <steps xsi:type="adaptation:StartAction" id="_iqERYKaMEeKdn_E8M08Q_g" successor="_jqTmYqaMEeKdn_E8M08Q_g"/> <steps xsi:type="adaptation:StopAction" id="_jO2ZcaaMEeKdn_E8M08Q_g" predecessor="_jqTmYqaMEeKdn_E8M08Q_g"/> - <steps xsi:type="adaptation:LoopAction" id="_jqTmYqaMEeKdn_E8M08Q_g" predecessor="_iqERYKaMEeKdn_E8M08Q_g" successor="_jO2ZcaaMEeKdn_E8M08Q_g" counter="1"> + <steps xsi:type="adaptation:LoopAction" id="_jqTmYqaMEeKdn_E8M08Q_g" predecessor="_iqERYKaMEeKdn_E8M08Q_g" successor="_jO2ZcaaMEeKdn_E8M08Q_g" counter="//@parameters.0"> <body id="_oCJwYKaMEeKdn_E8M08Q_g" name="removeVCPUorAppServer"> <steps xsi:type="adaptation:StartAction" id="321" successor="branchDecrease"/> <steps xsi:type="adaptation:BranchAction" id="branchDecrease" predecessor="321" successor="432" condition="RuntimeEnvironment.allInstances()->select( re | re.template = self.template and not re.configSpec->isEmpty())->exists(re | re.configSpec.oclAsType(resourceconfiguration::ActiveResourceSpecification).processingResourceSpecifications->forAll(nrOfParProcUnits.number > 2))"> @@ -110,6 +110,7 @@ </weightedMetrics> </weightingFunction> </strategies> + <parameters name="LoopCounter" type="EInteger" value="1"/> <goal description="Maintain SLAs of all serivces using resources efficiently"> <objectives id="_GdVkoKaGEeKsaqdh-1smGw" name="MaintainSLAs"> <specifications value="100.0" relationalOperator="LESS_EQUAL"> diff --git a/Examples/SEAMS_Case_Study/simucomresults.perfdatarepo b/Examples/SEAMS_Case_Study/simucomresults.perfdatarepo index b3040f1af6211bea323b37c0750a111d5128c456..5b47c106363d18407541585383c56b0211bf3c66 100644 --- a/Examples/SEAMS_Case_Study/simucomresults.perfdatarepo +++ b/Examples/SEAMS_Case_Study/simucomresults.perfdatarepo @@ -10,7 +10,7 @@ <metricValues id="r2mv2" name="RespTimeGold" metricType="3" value="145.0"/> <metricValues id="r2mv3" name="RespTimeSilver" metricType="4" value="330.0"/> </resultHistory> - <resultHistory id="r3" name="ResultTactic2" timestamp="2012-12-12T02:00:00.000+0100"> + <resultHistory id="r3" name="ResultTactic2" timestamp="2012-12-12T02:00:00.000+0100"> <metricValues id="r3mv1" name="Util" metricType="2" value="0.6"/> <metricValues id="r3mv2" name="RespTimeGold" metricType="3" value="140.0"/> <metricValues id="r3mv3" name="RespTimeSilver" metricType="4" value="320.0"/> @@ -33,7 +33,7 @@ </resultHistory> <resultHistory id="m2" name="ResultMigration1-2" timestamp="2012-12-12T02:00:00.000+0100"> <metricValues id="m2u1" name="Util1" metricType="2" value="0.5"/> - <metricValues id="m2u2" name="Util2" metricType="22" value="0.0"/> + <metricValues id="m2u2" name="Util2" metricType="22"/> <metricValues id="m2g" name="RespTimeGold" metricType="3" value="100.0"/> <metricValues id="m2s" name="RespTimeSilver" metricType="4" value="290.0"/> </resultHistory>