From 7186a66cc0d0ce252ff1de247e4acd0667bb5b36 Mon Sep 17 00:00:00 2001
From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de>
Date: Tue, 30 Apr 2013 13:12:05 +0000
Subject: [PATCH] git-svn-id:
 https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@11408
 9e42b895-fcda-4063-8a3b-11be15eb1bbd

---
 .../default.properties                        | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/edu.kit.ipd.descartes.adaptation/default.properties b/edu.kit.ipd.descartes.adaptation/default.properties
index 27fd7be8..b1be257d 100644
--- a/edu.kit.ipd.descartes.adaptation/default.properties
+++ b/edu.kit.ipd.descartes.adaptation/default.properties
@@ -3,18 +3,25 @@
 #performanceDataRepositoryModel=/Users/nhuber/Documents/workspace/descartes/metamodel/edu.kit.ipd.descartes.adaptation.test/test_models/PerformanceDataRepositoryDummy.xmi
 #maxIterations=2
 ## The list of triggering events can be found in AdaptationControl.java
-#event=
+#eventType=
 
-#processName=SEAMS_PushPull-v1
-#adaptationProcessModel=/Users/nhuber/Documents/workspace/descartes/metamodel/Examples/SEAMS_Case_Study/pushPullProcess.adaptation
-#performanceDataRepositoryModel=/Users/nhuber/Documents/workspace/descartes/metamodel/Examples/SEAMS_Case_Study/simucom-simulationResults.perfdatarepo
-#maxIterations=2
-## The list of triggering events can be found in AdaptationControl.java
-#event=SlaViolatedEvent
+processName=SEAMS_PushPull-v1
+adaptationProcessModel=/Users/nhuber/Documents/workspace/descartes/metamodel/Examples/SEAMS_Case_Study/pushpull.adaptation
+performanceDataRepositoryModel=/Users/nhuber/Documents/workspace/descartes/metamodel/Examples/SEAMS_Case_Study/simucomresults.perfdatarepo
+maxIterations=2
+# The list of triggering events can be found in AdaptationControl.java
+eventType=SlaViolatedEvent
 
-processName=BlueYonderTestAdaptationProcess
-adaptationProcessModel=/Users/nhuber/Documents/workspace/descartes/runtime-EclipseApplication/by_dmm-model/testprocess.adaptation
-performanceDataRepositoryModel=../Examples/SEAMS_Case_Study/simucom-simulationResults.perfdatarepo
-maxIterations=1
+#processName=BlueYonderTestAdaptationProcess
+#adaptationProcessModel=/Users/nhuber/Documents/workspace/descartes/runtime-EclipseApplication/by_dmm-model/testprocess.adaptation
+#performanceDataRepositoryModel=../Examples/SEAMS_Case_Study/simucom-simulationResults.perfdatarepo
+#maxIterations=1
+### The list of triggering events can be found in AdaptationControl.java
+#eventType=BottleneckFoundEvent
+
+#processName=SEAMS_PushPull-v2
+#adaptationProcessModel=/Users/nhuber/Documents/workspace/descartes/metamodel/edu.kit.ipd.descartes.adaptation.test/SEAMSv2_Case_Study/pushPullProcess.adaptation
+#performanceDataRepositoryModel=/Users/nhuber/Documents/workspace/descartes/metamodel/edu.kit.ipd.descartes.adaptation.test/SEAMSv2_Case_Study/simucom-simulationResults.perfdatarepo
+#maxIterations=2
 ## The list of triggering events can be found in AdaptationControl.java
-event=BottleneckFoundEvent
\ No newline at end of file
+#eventType=SlaViolatedEvent
\ No newline at end of file
-- 
GitLab