diff --git a/Examples/SEAMS_Case_Study/pushpull.adaptation b/Examples/SEAMS_Case_Study/pushpull.adaptation index edd205ac5774b6e6170b242ad382a24f93208327..109402a74a83151aedcb85f2ce45d6f199fc9fa2 100644 --- a/Examples/SEAMS_Case_Study/pushpull.adaptation +++ b/Examples/SEAMS_Case_Study/pushpull.adaptation @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ASCII"?> <adaptation:AdaptationProcess xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:adaptation="http://www.descartes-research.net/metamodel/adaptation/0.1" xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/0.1" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/0.1" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" id="_07SqMKaFEeKsaqdh-1smGw" name="PushPullAdaptationProcess"> - <tactics id="2341234" name="addResources"> - <implementedPlan id="qweqweqwe" name="addResourcesAdaptationPlan"> + <tactics id="2341234" name="AddResources"> + <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"> @@ -25,8 +25,8 @@ </steps> </implementedPlan> </tactics> - <tactics id="_zFC2EaaMEeKdn_E8M08Q_g" name="undoPreviousAction"> - <implementedPlan id="_1_t3cKaMEeKdn_E8M08Q_g" name="undoPreviousActionPlan"> + <tactics id="_zFC2EaaMEeKdn_E8M08Q_g" name="UndoPreviousAction"> + <implementedPlan id="_1_t3cKaMEeKdn_E8M08Q_g" name="UndoPreviousActionPlan"> <steps xsi:type="adaptation:StartAction" id="_9awssKaMEeKdn_E8M08Q_g" successor="_-Pacw6aMEeKdn_E8M08Q_g"/> <steps xsi:type="adaptation:BranchAction" id="_-Pacw6aMEeKdn_E8M08Q_g" predecessor="_9awssKaMEeKdn_E8M08Q_g" successor="_9ysEgaaMEeKdn_E8M08Q_g" condition=""> <context xsi:type="containerrepository:ContainerTemplate" href="default.containerrepository#2"/> @@ -44,8 +44,8 @@ <steps xsi:type="adaptation:StopAction" id="_9ysEgaaMEeKdn_E8M08Q_g" predecessor="_-Pacw6aMEeKdn_E8M08Q_g"/> </implementedPlan> </tactics> - <tactics id="123123" name="removeResources"> - <implementedPlan id="123123123" name="removeResourcesAdaptationPlan"> + <tactics id="123123" name="RemoveResources"> + <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"> @@ -100,7 +100,7 @@ </weightingFunction> </strategies> <strategies id="_Cg--ZYAnEeKW2vVcg5ekRw" name="PULL" objective="_G-ctoKaGEeKsaqdh-1smGw"> - <triggeringEvents id="_H_MTgIAnEeKW2vVcg5ekRw" name="ScheduledMaintenanceEvent"/> + <triggeringEvents id="_H_MTgIAnEeKW2vVcg5ekRw" name="ScheduledOptimizationEvent"/> <tactics id="_Tk5LUYAnEeKW2vVcg5ekRw" name="RemoveResourcesWeightedTactic" usedTactic="123123" currentWeight="1.0" defaultWeight="1.0"/> <tactics id="_4j5FkaamEeKwhcuIujY6Yw" name="UndoPreviousActionWeightedTactic" usedTactic="_zFC2EaaMEeKdn_E8M08Q_g" currentWeight="0.5" defaultWeight="0.5"/> <weightingFunction id="wf2" name="WeightedSum">