From dd8c7af1cdb0476f6a185a1698c77a8bbf6ec032 Mon Sep 17 00:00:00 2001
From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de>
Date: Fri, 18 Jan 2013 13:08:20 +0000
Subject: [PATCH] git-svn-id:
https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@9814
9e42b895-fcda-4063-8a3b-11be15eb1bbd
---
.../test_models/StaRepository.xmi | 20 +++++++++----------
1 file changed, 9 insertions(+), 11 deletions(-)
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 6249dea4..b6600977 100644
--- a/edu.kit.ipd.descartes.adaptation.test/test_models/StaRepository.xmi
+++ b/edu.kit.ipd.descartes.adaptation.test/test_models/StaRepository.xmi
@@ -1,12 +1,9 @@
<?xml version="1.0" encoding="ASCII"?>
-<adaptation:AdaptationProcess
- xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI"
- 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"
- id="q" name="MyTestStaRepo">
+<adaptation:AdaptationProcess xmi:version="2.0"
+ xmlns:xmi="http://www.omg.org/XMI"
+ 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" id="q" name="MyTestStaRepo">
<tactics id="2341234" name="myFirstIncreaseResourceTactic">
<implementedPlan id="qweqweqwe" name="IncreaseResourcesAdaptationPlan">
<steps xsi:type="adaptation:StartAction" id="2342623434" successor="35634534"/>
@@ -55,8 +52,7 @@
<implementedPlan id="45123123" name="testBranchActionAdaptationPlan">
<steps xsi:type="adaptation:StartAction" id="branchStart" successor="branchAction"/>
<steps xsi:type="adaptation:StopAction" id="branchStop" predecessor="branchAction"/>
- <steps xsi:type="adaptation:BranchAction" id="branchAction" predecessor="branchStart" successor="branchStop" condition="RuntimeEnvironment.allInstances()->size() < 4">
- <context href="DistributedDataCenter.xmi#2313"/>
+ <steps xsi:type="adaptation:BranchAction" id="branchAction" predecessor="branchStart" successor="branchStop" context="DistributedDataCenter.xmi#2313" condition="RuntimeEnvironment.allInstances()->size() < 4">
<conditionTrueBranch id="TRUE-AdaptationPlan" name="TRUE-AdaptationPlan">
<steps xsi:type="adaptation:StartAction" id="98start" successor="98trueBranch"/>
<steps xsi:type="adaptation:ActionReference" id="98trueBranch" predecessor="98start" successor="98stop" refersTo="2"/>
@@ -97,7 +93,9 @@
<lastImpact href="PerformanceDataRepositoryDummy.xmi#3df1q3eq"/>
</tactics>
<tactics id="634524" name="testDecreaseResource" usedTactic="123123" currentWeight="100.0" defaultWeight="1.0"/>
- <tactics id="6324234" name="testTemplateScaling" usedTactic="323423123137" currentWeight="3000.0" defaultWeight="1.0"/>
+ <tactics id="6324234" name="testTemplateScaling" usedTactic="323423123137" currentWeight="230.4" defaultWeight="1.0">
+ <lastImpact href="PerformanceDataRepositoryDummy.xmi#3df1q3eq"/>
+ </tactics>
<tactics id="123migrationTest123" name="testMigration" usedTactic="12312412312" currentWeight="350.0"/>
<tactics id="451234123" name="testLoopActionTactic" usedTactic="123432"/>
<tactics id="testBranch" name="testBranchWeightedTactic" usedTactic="testBranch123235" currentWeight="100.0"/>
--
GitLab