From 7b48322578151fb2bad20f8ceb792ca385c1e2b0 Mon Sep 17 00:00:00 2001
From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de>
Date: Mon, 10 Jun 2013 11:39:48 +0000
Subject: [PATCH] git-svn-id:
https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@12008
9e42b895-fcda-4063-8a3b-11be15eb1bbd
---
.../edu/kit/ipd/descartes/adaptation/AdaptationControl.java | 6 +++---
.../model/perfdatarepo/ObservationRepositoryHelper.java | 6 ++++++
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/AdaptationControl.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/AdaptationControl.java
index 5d954789..5bb1d6c1 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/AdaptationControl.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/AdaptationControl.java
@@ -178,8 +178,8 @@ public class AdaptationControl {
*/
public void processResults(WeightedTactic tactic) {
- // Impact latestImpact = perfdatarepo.getImpactAt(iteration);
- String expName = ObservationRepositoryHelper.deriveExperimentName(tactic);
+// Impact latestImpact = perfdatarepo.getImpactAt(iteration);
+ String expName = ObservationRepositoryHelper.deriveExperimentName(tactic, iteration + 1);
Impact latestImpact = PerfDataRepoConverter.convertObservableImpact(ObservationRepositoryHelper
.searchImpactOfTactic(expName, performanceDataRepoXmiFilePath));
// Connect parsed results to the executed tactic
@@ -207,7 +207,7 @@ public class AdaptationControl {
}
/**
- * Graceful stop the adaptation process.
+ * Gracefully stop the adaptation process.
*/
public void stop() {
logger.info("Stopping adaptation process");
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 fa8785fa..410ff945 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
@@ -43,6 +43,9 @@ public class ObservationRepositoryHelper {
}
private static ObservableImpact deriveImpact(Observation o, ObservationRepository repo) {
+ if (o == null || repo == null)
+ return null;
+
List<ObservableImpact> impacts = repo.getImpacts();
for (ObservableImpact oi : impacts) {
if (EcoreUtil.equals(oi.getAfter(), o))
@@ -59,6 +62,9 @@ public class ObservationRepositoryHelper {
* @return first result that ends the given suffix, null otherwise.
*/
public static Observation getResultEndingWith(String suffix, ObservationRepository repo) {
+ if (suffix == null || repo == null)
+ return null;
+
List<Observation> results = repo.getObservations();
for (Observation o : results) {
if (o.getIdentifier().endsWith(suffix))
--
GitLab