diff --git a/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/PushPullAdaptationProcess.xmi b/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/PushPullAdaptationProcess.xmi index 391a7f60f1bcaf0f0a63c5ba9676a331ca9c0a6e..89857bb7963dae6db7446e0670d28ba1db7d29b9 100644 --- a/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/PushPullAdaptationProcess.xmi +++ b/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/PushPullAdaptationProcess.xmi @@ -82,7 +82,7 @@ id="branchDecrease" predecessor="321" successor="432" - condition="RuntimeEnvironment.allInstances()->
	select( re | re.template = self.template )->exists(re | re.configSpec.oclAsType(resourceconfiguration::ActiveResourceSpecification).processingResourceSpecifications->forAll(nrOfParProcUnits.number > 2))"> + 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))"> <context xsi:type="resourcelandscape:RuntimeEnvironment" href="AcamarCluster.xmi#12"/> @@ -130,7 +130,7 @@ </implementedPlan> </tactics> <tactics id="_aGL2MIC4EeKnieBrE9C24w" - name="increaseVCPUsOnly"> + name="TEST-increaseVCPUsOnly"> <implementedPlan id="_dQICoIC4EeKnieBrE9C24w" name="increaseVCPUsOnly"> @@ -199,11 +199,6 @@ usedTactic="2341234" currentWeight="100.0" defaultWeight="100.0"/> - <tactics - id="_mjtG0YC4EeKnieBrE9C24w" - name="increaseVCPUsOnly" - usedTactic="_aGL2MIC4EeKnieBrE9C24w" - currentWeight="1000.0"/> <weightingFunction id="wf1" name="weightedSum">