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 6ff3a535b36477061113fbbd250c4798a9fadca0..cbe4b9365bd6d4177abe43bf9617f159eeec510c 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 @@ -274,34 +274,27 @@ name="SlaViolatedEvent"/> <tactics id="wt1" - name="weightedTacticIncreaseResources" + name="AddResourcesWeightedTactic" usedTactic="2341234" - currentWeight="100.0" - defaultWeight="100.0"/> + currentWeight="1.0" + defaultWeight="1.0"/> <weightingFunction id="wf1" - name="weightedSum"> + name="WeightedSum"> <weightedMetrics id="_TzHMgGVXEeK4L53_AeGtGA" - name="utilizationMetricWeight" + name="UtilizationWeight" weight="1.0"> <metricType href="PerformanceDataRepositoryDummy.xmi#2"/> </weightedMetrics> <weightedMetrics id="_QKf6YGllEeKYrN0mFHpJCQ" - name="goldCustomerResponseTimeWeight" + name="ResponseTimeWeight" weight="-2.0"> <metricType href="PerformanceDataRepositoryDummy.xmi#3"/> </weightedMetrics> - <weightedMetrics - id="_UBs1cGllEeKYrN0mFHpJCQ" - name="silverCustomerResponseTimeWeight" - weight="-1.0"> - <metricType - href="PerformanceDataRepositoryDummy.xmi#4"/> - </weightedMetrics> </weightingFunction> </strategies> <strategies @@ -312,43 +305,43 @@ name="ScheduledMaintenanceEvent"/> <tactics id="_Tk5LUYAnEeKW2vVcg5ekRw" - name="weightedTacticDecreaseResources" + name="RemoveResourcesWeightedTactic" usedTactic="123123" - currentWeight="100.0" - defaultWeight="100.0"/> + 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"> + id="wf1" + name="WeightedSum"> <weightedMetrics id="_TzHMgGVXEeK4L53_AeGtGA1" - name="utilizationMetricWeight" + name="UtilizationWeight" weight="1.0"> <metricType href="PerformanceDataRepositoryDummy.xmi#2"/> </weightedMetrics> <weightedMetrics - id="_QKf6YGllEeKYrN0mFHpJCQ1" - name="goldCustomerResponseTimeWeight" + id="_Fc5YUKanEeKwhcuIujY6Yw" + name="ResponseTimeWeight" weight="-2.0"> <metricType href="PerformanceDataRepositoryDummy.xmi#3"/> </weightedMetrics> - <weightedMetrics - id="_UBs1cGllEeKYrN0mFHpJCQ1" - name="silverCustomerResponseTimeWeight" - weight="-1.0"> - <metricType - href="PerformanceDataRepositoryDummy.xmi#4"/> - </weightedMetrics> </weightingFunction> </strategies> - <goal description="<<Maintain SLAs of all serivces while using resources efficiently>>"> + <goal description="<<Maintain SLAs of all serivces using resources efficiently>>"> <objectives id="_GdVkoKaGEeKsaqdh-1smGw" - name="ServiceLevelAgreements" - specification=""/> + name="MaintainSLAs" + specification="90% Quantile of ResponseTime"/> <objectives id="_G-ctoKaGEeKsaqdh-1smGw" - name="resourceEfficiency"/> + name="OptimizeResourceEfficiency" + specification="85% > Utilization > 45%"/> </goal> </adaptation:AdaptationProcess>