From 4177faf0f2eb0183f065a4f66f3e7c48828832c3 Mon Sep 17 00:00:00 2001
From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de>
Date: Thu, 10 Jan 2013 14:32:51 +0000
Subject: [PATCH] added branch condition context element
git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@9711 9e42b895-fcda-4063-8a3b-11be15eb1bbd
---
.../test_models/StaRepository.xmi | 10 +++++-----
1 file changed, 5 insertions(+), 5 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 c97456fe..5d62c31f 100644
--- a/edu.kit.ipd.descartes.adaptation.test/test_models/StaRepository.xmi
+++ b/edu.kit.ipd.descartes.adaptation.test/test_models/StaRepository.xmi
@@ -167,7 +167,9 @@
id="branchAction"
predecessor="branchStart"
successor="branchStop"
- condition="self.containedIn.contains -> select( r
 | r.template = self.template)->size() <= 4">
+ condition="RuntimeEnvironment.allInstances()->size() < 4">
+ <context
+ href="DistributedDataCenter.xmi#2313"/>
<conditionTrueBranch
id="TRUE-AdaptationPlan"
name="TRUE-AdaptationPlan">
@@ -289,14 +291,12 @@
<tactics
id="451234123"
name="testLoopActionTactic"
- usedTactic="123432"
- currentWeight="2000.0"/>
+ usedTactic="123432"/>
<tactics
id="testBranch"
name="testBranchWeightedTactic"
usedTactic="testBranch123235"
- currentWeight="100.0"
- defaultWeight="100.0"/>
+ currentWeight="1000.0"/>
<weightingFunction
id="123sum"
name="WeightedSum">
--
GitLab