From b436dcf3b2f53dbbdea3cbd93f2b33afd92d1e0a Mon Sep 17 00:00:00 2001
From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de>
Date: Mon, 10 Jun 2013 07:48:14 +0000
Subject: [PATCH] git-svn-id:
https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@12001
9e42b895-fcda-4063-8a3b-11be15eb1bbd
---
.../ObservationRepositoryHelper.java | 28 ++++++++++++-------
1 file changed, 18 insertions(+), 10 deletions(-)
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/perfdatarepo/ObservationRepositoryHelper.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/perfdatarepo/ObservationRepositoryHelper.java
index 409d1156..fa8785fa 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/perfdatarepo/ObservationRepositoryHelper.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/perfdatarepo/ObservationRepositoryHelper.java
@@ -10,7 +10,6 @@ import edu.kit.ipd.descartes.ql.models.repository.ObservableImpact;
import edu.kit.ipd.descartes.ql.models.repository.Observation;
import edu.kit.ipd.descartes.ql.models.repository.ObservationRepository;
-
public class ObservationRepositoryHelper {
public static ObservableImpact searchImpactOfTactic(String name, String modelUri) {
@@ -19,17 +18,29 @@ public class ObservationRepositoryHelper {
// Get correct result
Observation o = getResultEndingWith(name, repo);
-
+
// Derive impact from result
ObservableImpact i = deriveImpact(o, repo);
return i;
}
-
public static String deriveExperimentName(WeightedTactic tactic) {
return tactic.getName();
}
+ public static String deriveExperimentName(WeightedTactic tactic, int iteration) {
+
+ String execTacticName = tactic.getName();
+
+ if (execTacticName.contains("Low")) {
+ String desc1 = "Xreq-par-Yps-desc4-gw-desc3-db-desc2-predict-Z ps=$-req=5-size=50000";
+ return null;
+ } else if (execTacticName.contains("High")) {
+ String desc4 = "Xreq-par-Yps-desc4-gw-desc3-db-desc2-predict-Z ps=$-req=5-size=50000";
+ return desc4.replace("$", Integer.toString(iteration));
+ }
+ return null;
+ }
private static ObservableImpact deriveImpact(Observation o, ObservationRepository repo) {
List<ObservableImpact> impacts = repo.getImpacts();
@@ -37,14 +48,12 @@ public class ObservationRepositoryHelper {
if (EcoreUtil.equals(oi.getAfter(), o))
return oi;
}
-
+
return null;
}
-
- /**
- * Searches the observation repository for an observation that ends with the given
- * suffix.
+ /**
+ * Searches the observation repository for an observation that ends with the given suffix.
*
* @param suffix
* @return first result that ends the given suffix, null otherwise.
@@ -52,11 +61,10 @@ public class ObservationRepositoryHelper {
public static Observation getResultEndingWith(String suffix, ObservationRepository repo) {
List<Observation> results = repo.getObservations();
for (Observation o : results) {
- if(o.getIdentifier().endsWith(suffix))
+ if (o.getIdentifier().endsWith(suffix))
return o;
}
return null;
}
-
}
--
GitLab