From ade473f599a4fcf2ed0fb46723942a1570950564 Mon Sep 17 00:00:00 2001
From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de>
Date: Tue, 4 Jun 2013 14:44:58 +0000
Subject: [PATCH] adjustments weighting function

git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@11926 9e42b895-fcda-4063-8a3b-11be15eb1bbd
---
 Examples/SEAMS_Case_Study/pushpull.adaptation | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Examples/SEAMS_Case_Study/pushpull.adaptation b/Examples/SEAMS_Case_Study/pushpull.adaptation
index 6e327fad..77a64c4e 100644
--- a/Examples/SEAMS_Case_Study/pushpull.adaptation
+++ b/Examples/SEAMS_Case_Study/pushpull.adaptation
@@ -87,10 +87,8 @@
   </actions>
   <strategies id="s1" name="PUSH" objective="_GdVkoKaGEeKsaqdh-1smGw">
     <triggeringEvents id="12345" name="SlaViolatedEvent"/>
-    <tactics id="wt1" name="AddResourcesWeightedTactic" usedTactic="2341234" currentWeight="60.2" defaultWeight="1.0">
-      <lastImpact href="simucomresults.perfdatarepo#3df1q3eq"/>
-    </tactics>
-    <weightingFunction id="wf1" name="WeightedSum" WeightingFunction="WeightedSum">
+    <tactics id="wt1" name="AddResourcesWeightedTactic" usedTactic="2341234" defaultWeight="1.0"/>
+    <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="simucomresults.perfdatarepo#2"/>
       </weightedMetrics>
@@ -103,7 +101,7 @@
     <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" 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="simucomresults.perfdatarepo#2"/>
       </weightedMetrics>
-- 
GitLab