From 5969607825c2e4819cc0ad77954a4f3406fe4fad Mon Sep 17 00:00:00 2001
From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de>
Date: Tue, 4 Jun 2013 14:43:09 +0000
Subject: [PATCH] adjustments to weightingfunction
git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@11925 9e42b895-fcda-4063-8a3b-11be15eb1bbd
---
.../test_models/SEAMSv2_Case_Study/pushPullProcess.adaptation | 4 ++--
.../test_models/StaRepository.xmi | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMSv2_Case_Study/pushPullProcess.adaptation b/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMSv2_Case_Study/pushPullProcess.adaptation
index a0fe108b..19a30ccb 100644
--- a/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMSv2_Case_Study/pushPullProcess.adaptation
+++ b/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMSv2_Case_Study/pushPullProcess.adaptation
@@ -88,7 +88,7 @@
<strategies id="s1" name="PUSH" objective="_GdVkoKaGEeKsaqdh-1smGw">
<triggeringEvents id="12345" name="SlaViolatedEvent"/>
<tactics id="wt1" name="AddResourcesWeightedTactic" usedTactic="2341234" currentWeight="1.0" defaultWeight="1.0"/>
- <weightingFunction id="wf1" name="WeightedSum" WeightingFunction="WeightedSum">
+ <weightingFunction id="wf1" name="WeightedSum" weightingFunctionImplementation="edu.kit.ipd.descartes.adaptation.evaluation.weightingfunction.WeightedSum">
<weightedMetrics id="_TzHMgGVXEeK4L53_AeGtGA" name="UtilizationWeight" weight="1.0">
<metricType href="simucom-simulationResults.perfdatarepo#2"/>
</weightedMetrics>
@@ -101,7 +101,7 @@
<triggeringEvents id="_H_MTgIAnEeKW2vVcg5ekRw" name="ScheduledMaintenanceEvent"/>
<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" WeightingFunction="WeightedSum">
+ <weightingFunction id="wf2" name="WeightedSum" weightingFunctionImplementation="edu.kit.ipd.descartes.adaptation.evaluation.weightingfunction.WeightedSum">
<weightedMetrics id="_TzHMgGVXEeK4L53_AeGtGA1" name="UtilizationWeight" weight="1.0">
<metricType href="simucom-simulationResults.perfdatarepo#2"/>
</weightedMetrics>
diff --git a/edu.kit.ipd.descartes.adaptation.test/test_models/StaRepository.xmi b/edu.kit.ipd.descartes.adaptation.test/test_models/StaRepository.xmi
index 9bd6a5b2..3127c72d 100644
--- a/edu.kit.ipd.descartes.adaptation.test/test_models/StaRepository.xmi
+++ b/edu.kit.ipd.descartes.adaptation.test/test_models/StaRepository.xmi
@@ -321,7 +321,7 @@
<weightingFunction
id="123sum"
name="WeightedSum"
- WeightingFunction="WeightedSum">
+ weightingFunctionImplementation="WeightedSum">
<weightedMetrics
id="4112213"
name="UtilWeight"
--
GitLab