diff --git a/Examples/SEAMS_Case_Study/metrictypes.xmi b/Examples/SEAMS_Case_Study/metrictypes.perfdatarepo similarity index 81% rename from Examples/SEAMS_Case_Study/metrictypes.xmi rename to Examples/SEAMS_Case_Study/metrictypes.perfdatarepo index 23e64013b4cc21427dabdd54aff2de85c82cd4f7..d1a0231c33ad7e67c57d1024e6a812604dbc2abc 100644 --- a/Examples/SEAMS_Case_Study/metrictypes.xmi +++ b/Examples/SEAMS_Case_Study/metrictypes.perfdatarepo @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="ASCII"?> -<perfdatarepo:PerformanceDataRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:perfdatarepo="http://www.descartes-research.net/metamodel/perfdata/0.1" id="1" name="DefaultMetricTypes"> +<perfdatarepo:PerformanceDataRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:perfdatarepo="http://www.descartes-research.net/metamodel/perfdata/0.1" id="1" name="MeasuredPerformanceDataRepository"> <metricTypes id="2" name="Vm1Utilization"/> <metricTypes id="22" name="Vm2Utilization"/> <metricTypes id="3" name="CV_EJB_AvgResponseTime"/> diff --git a/Examples/SEAMS_Case_Study/pushpull.adaptation b/Examples/SEAMS_Case_Study/pushpull.adaptation index b289dab28986a9dc42ebbf449da2c121469ad535..e6ab6a8c8ed7535fc06334bb65cb68831ebd3bb5 100644 --- a/Examples/SEAMS_Case_Study/pushpull.adaptation +++ b/Examples/SEAMS_Case_Study/pushpull.adaptation @@ -90,10 +90,10 @@ <tactics id="wt1" name="AddResourcesWeightedTactic" usedTactic="2341234" defaultWeight="1.0"/> <weightingFunction id="wf1" name="WeightedSum" weightingFunctionImplementation="edu.kit.ipd.descartes.adaptation.evaluation.performance.weightingfunction.WeightedSum"> <weightedMetrics id="_TzHMgGVXEeK4L53_AeGtGA" name="UtilizationWeight" weight="1.0"> - <metricType href="simucomresults.perfdatarepo#2"/> + <metricType href="metrictypes.perfdatarepo#2"/> </weightedMetrics> <weightedMetrics id="_QKf6YGllEeKYrN0mFHpJCQ" name="ResponseTimeWeight" weight="-2.0"> - <metricType href="simucomresults.perfdatarepo#3"/> + <metricType href="metrictypes.perfdatarepo#3"/> </weightedMetrics> </weightingFunction> </strategies> @@ -103,10 +103,10 @@ <tactics id="_4j5FkaamEeKwhcuIujY6Yw" name="UndoPreviousActionWeightedTactic" usedTactic="_zFC2EaaMEeKdn_E8M08Q_g" currentWeight="0.5" defaultWeight="0.5"/> <weightingFunction id="wf2" name="WeightedSum" weightingFunctionImplementation="edu.kit.ipd.descartes.adaptation.evaluation.performance.weightingfunction.WeightedSum"> <weightedMetrics id="_TzHMgGVXEeK4L53_AeGtGA1" name="UtilizationWeight" weight="1.0"> - <metricType href="simucomresults.perfdatarepo#2"/> + <metricType href="metrictypes.perfdatarepo#2"/> </weightedMetrics> <weightedMetrics id="_Fc5YUKanEeKwhcuIujY6Yw" name="ResponseTimeWeight" weight="-2.0"> - <metricType href="simucomresults.perfdatarepo#3"/> + <metricType href="metrictypes.perfdatarepo#3"/> </weightedMetrics> </weightingFunction> </strategies> @@ -114,24 +114,24 @@ <goal description="Maintain SLAs of all serivces using resources efficiently"> <objectives id="_GdVkoKaGEeKsaqdh-1smGw" name="MaintainSLAs"> <specifications value="100.0" relationalOperator="LESS_EQUAL"> - <metricType href="simucomresults.perfdatarepo#3"/> + <metricType href="metrictypes.perfdatarepo#3"/> </specifications> <specifications value="300.0" relationalOperator="LESS"> - <metricType href="simucomresults.perfdatarepo#4"/> + <metricType href="metrictypes.perfdatarepo#4"/> </specifications> </objectives> <objectives id="_G-ctoKaGEeKsaqdh-1smGw" name="OptimizeResourceEfficiency"> <specifications value="0.4" relationalOperator="GREATER"> - <metricType href="simucomresults.perfdatarepo#2"/> + <metricType href="metrictypes.perfdatarepo#2"/> </specifications> <specifications value="0.85" relationalOperator="LESS"> - <metricType href="simucomresults.perfdatarepo#2"/> + <metricType href="metrictypes.perfdatarepo#2"/> </specifications> <specifications value="100.0" relationalOperator="LESS_EQUAL"> - <metricType href="simucomresults.perfdatarepo#3"/> + <metricType href="metrictypes.perfdatarepo#3"/> </specifications> <specifications value="300.0" relationalOperator="LESS_EQUAL"> - <metricType href="simucomresults.perfdatarepo#4"/> + <metricType href="metrictypes.perfdatarepo#4"/> </specifications> </objectives> </goal> diff --git a/Examples/SEAMS_Case_Study/simucomresults.perfdatarepo b/Examples/SEAMS_Case_Study/simucomresults.perfdatarepo deleted file mode 100644 index 5b47c106363d18407541585383c56b0211bf3c66..0000000000000000000000000000000000000000 --- a/Examples/SEAMS_Case_Study/simucomresults.perfdatarepo +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?> -<perfdatarepo:PerformanceDataRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:perfdatarepo="http://www.descartes-research.net/metamodel/perfdata/0.1" id="1" name="MeasuredPerformanceDataRepository"> - <resultHistory id="r1" name="DefaultSystemState" timestamp="2012-12-12T00:00:00.000+0100"> - <metricValues id="r1mv1" name="Util" metricType="2" value="0.7"/> - <metricValues id="r1mv2" name="RespTimeGold" metricType="3" value="150.0"/> - <metricValues id="r1mv3" name="RespTimeSilver" metricType="4" value="340.0"/> - </resultHistory> - <resultHistory id="r2" name="ResultTactic1" timestamp="2012-12-12T01:00:00.000+0100"> - <metricValues id="r2mv1" name="Util" metricType="2" value="0.65"/> - <metricValues id="r2mv2" name="RespTimeGold" metricType="3" value="145.0"/> - <metricValues id="r2mv3" name="RespTimeSilver" metricType="4" value="330.0"/> - </resultHistory> - <resultHistory id="r3" name="ResultTactic2" timestamp="2012-12-12T02:00:00.000+0100"> - <metricValues id="r3mv1" name="Util" metricType="2" value="0.6"/> - <metricValues id="r3mv2" name="RespTimeGold" metricType="3" value="140.0"/> - <metricValues id="r3mv3" name="RespTimeSilver" metricType="4" value="320.0"/> - </resultHistory> - <resultHistory id="r4" name="ResultTactic3" timestamp="2012-12-12T02:00:00.000+0100"> - <metricValues id="r4mv1" name="Util" metricType="2" value="0.3"/> - <metricValues id="r4mv2" name="RespTimeGold" metricType="3" value="100.0"/> - <metricValues id="r4mv3" name="RespTimeSilver" metricType="4" value="280.0"/> - </resultHistory> - <resultHistory id="r5" name="ResultTactic4" timestamp="2012-12-12T03:00:00.000+0100"> - <metricValues id="r5mv1" name="Util" metricType="2" value="0.25"/> - <metricValues id="r5mv2" name="RespTimeGold" metricType="3" value="90.0"/> - <metricValues id="r5mv3" name="RespTimeSilver" metricType="4" value="260.0"/> - </resultHistory> - <resultHistory id="m1" name="ResultMigration1-1" timestamp="2012-12-12T02:00:00.000+0100"> - <metricValues id="m1u1" name="Util1" metricType="2" value="0.2"/> - <metricValues id="m1u2" name="Util2" metricType="22" value="0.2"/> - <metricValues id="m1g" name="RespTimeGold" metricType="3" value="80.0"/> - <metricValues id="m1s" name="RespTimeSilver" metricType="4" value="250.0"/> - </resultHistory> - <resultHistory id="m2" name="ResultMigration1-2" timestamp="2012-12-12T02:00:00.000+0100"> - <metricValues id="m2u1" name="Util1" metricType="2" value="0.5"/> - <metricValues id="m2u2" name="Util2" metricType="22"/> - <metricValues id="m2g" name="RespTimeGold" metricType="3" value="100.0"/> - <metricValues id="m2s" name="RespTimeSilver" metricType="4" value="290.0"/> - </resultHistory> - <metricTypes id="2" name="Vm1Utilization"/> - <metricTypes id="22" name="Vm2Utilization"/> - <metricTypes id="3" name="CV_EJB_AvgResponseTime"/> - <metricTypes id="4" name="Purchase_AvgResponseTime"/> - <impactHistory id="i4" name="Tactic4-AllImproved" before="r4" after="r5"/> - <impactHistory id="i1" name="Tactic1-AllImproved" before="r1" after="r2"/> - <impactHistory id="i2" name="Tactic2-AllImproved" before="r2" after="r3"/> - <impactHistory id="i3" name="Tactic3-AllImproved" before="r3" after="r4"/> - <impactHistory id="mi1" name="MigrationEffect1" before="m1" after="m2"/> -</perfdatarepo:PerformanceDataRepository>