git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@9933 9e42b895-fcda-4063-8a3b-11be15eb1bbd

edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/AdaptationPoints.xmi

 <?xml version="1.0" encoding="ASCII"?>
-<adaptationpoints:AdaptationPointDescriptions xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/0.1" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/0.1" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/0.1" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" xsi:schemaLocation="http://www.descartes-research.net/metamodel/adaptationpoints/0.1 ../../../edu.kit.ipd.descartes.mm.adaptationpoints/model/adaptationpoints.ecore http://www.descartes-research.net/metamodel/containerrepository/0.1 ../../../edu.kit.ipd.descartes.mm.resourcelandscape/model/containerrepository.ecore http://www.descartes-research.net/metamodel/resourceconfiguration/0.1 ../../../edu.kit.ipd.descartes.mm.resourcelandscape/model/resourceconfiguration.ecore http://www.descartes-research.net/metamodel/resourcelandscape/0.1 ../../../edu.kit.ipd.descartes.mm.resourcelandscape/model/resourcelandscape.ecore" id="1" name="SEAMS-AdaptationPoints">
+<adaptationpoints:AdaptationPointDescriptions xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/0.1" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/0.1" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/0.1" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" id="1" name="SEAMS-AdaptationPoints">
   <adaptationPoints xsi:type="adaptationpoints:ModelVariableConfigurationRange" id="238746123" name="AmountOfCores" minValue="1.0" maxValue="4.0">
     <adaptableEntity xsi:type="resourceconfiguration:NumberOfParallelProcessingUnits" href="ContainerTemplateRepo.xmi#1341341"/>
   </adaptationPoints>

edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/ContainerTemplateRepo.xmi

 <?xml version="1.0" encoding="ASCII"?>
-<containerrepository:ContainerRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/0.1" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/0.1" xsi:schemaLocation="http://www.descartes-research.net/metamodel/containerrepository/0.1 ../../../edu.kit.ipd.descartes.mm.resourcelandscape/model/containerrepository.ecore http://www.descartes-research.net/metamodel/resourceconfiguration/0.1 ../../../edu.kit.ipd.descartes.mm.resourcelandscape/model/resourceconfiguration.ecore" id="1" name="AcamarClusterContainerTemplates">
+<containerrepository:ContainerRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/0.1" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/0.1" id="1" name="AcamarClusterContainerTemplates">
   <templates id="2" name="AppServerVmTemplate">
     <templateConfig xsi:type="resourceconfiguration:ActiveResourceSpecification" id="3" name="CpusAppServer">
       <processingResourceSpecifications id="235234" name="CPU-Spec" schedulingPolicy="PROCESSOR_SHARING" processingRate="1000.0" parentResourceSpecification="3">

edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/PushPullAdaptationProcess.xmi

@@ -5,7 +5,7 @@
     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"
-    xsi:schemaLocation="http://www.descartes-research.net/metamodel/adaptation/0.1 ../../../edu.kit.ipd.descartes.mm.adaptation/model/adaptation.ecore http://www.descartes-research.net/metamodel/adaptationpoints/0.1 ../../../edu.kit.ipd.descartes.mm.adaptationpoints/model/adaptationpoints.ecore"
+    xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1"
     id="q" name="MyTestStaRepo">
   <tactics id="2341234"
       name="increaseResources">
@@ -22,8 +22,6 @@
           predecessor="2342623434"
           successor="6423423423"
           condition="RuntimeEnvironment.allInstances()->select( re | re.template = self.template )->forAll(re | re.template.templateConfig.oclAsType(resourceconfiguration::ActiveResourceSpecification).processingResourceSpecifications->forAll(nrOfParProcUnits.number &lt;= 4))">
-        <context
-            href="AcamarCluster.xmi#12"/>
         <conditionTrueBranch
             id="efasfasd"
             name="increaseCores">
@@ -60,6 +58,9 @@
               id="e63412"
               predecessor="453412341241"/>
         </conditionFalseBranch>
+        <context
+            xsi:type="resourcelandscape:RuntimeEnvironment"
+            href="AcamarCluster.xmi#12"/>
       </steps>
       <steps
           xsi:type="adaptation:StopAction"
@@ -138,7 +139,8 @@
     <weightingFunction
         id="wf1"
         name="weightedSum">
-      <weightedMetrics/>
+      <weightedMetrics
+          id="_TzHMgGVXEeK4L53_AeGtGA"/>
     </weightingFunction>
   </strategies>
   <goal description="Maintain the SLAs of all serivces while using resources as efficiently as possible">