From e8abb9715b79c8e4d9b5779a60335f8a93174e3d Mon Sep 17 00:00:00 2001
From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de>
Date: Thu, 27 Jun 2013 15:19:09 +0000
Subject: [PATCH] fixes feature to parse all PS instances
git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@12301 9e42b895-fcda-4063-8a3b-11be15eb1bbd
---
.../model/perfdatarepo/ObservationRepositoryHandler.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/perfdatarepo/ObservationRepositoryHandler.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/perfdatarepo/ObservationRepositoryHandler.java
index eb62e0cc..03e860fc 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/perfdatarepo/ObservationRepositoryHandler.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/perfdatarepo/ObservationRepositoryHandler.java
@@ -7,6 +7,7 @@ import org.eclipse.emf.common.util.URI;
import edu.kit.ipd.descartes.adaptation.TacticsHistory;
import edu.kit.ipd.descartes.adaptation.model.AbstractEcoreModelLoader;
+import edu.kit.ipd.descartes.adaptation.model.dmm.AdaptationProcessModelLoader;
import edu.kit.ipd.descartes.adaptation.util.BlueYonderExperimentTracker;
import edu.kit.ipd.descartes.mm.adaptation.WeightedTactic;
import edu.kit.ipd.descartes.perfdatarepo.Impact;
@@ -44,7 +45,9 @@ public class ObservationRepositoryHandler implements IPerformanceDataRepositoryH
if (latestTactic == null) {
o = repository.getLatestObservation();
} else {
- String expName = tracker.getCurrentExperimentName();
+ // TODO: Blue Yonder specific, introduce abstraction layer
+// String expName = tracker.getCurrentExperimentName();
+ String expName = tracker.getExperimentNameForDistributedDataCenter(AdaptationProcessModelLoader.getDistributedDataCenter());
logger.debug("Searching for result of " + expName);
o = ObservationRepositoryHelper.getResultEndingWith(expName, repository);
}
@@ -55,7 +58,8 @@ public class ObservationRepositoryHandler implements IPerformanceDataRepositoryH
@Override
public Impact getLatestImpact(WeightedTactic tactic) {
tracker.track(tactic);
- String expName = tracker.getCurrentExperimentName();
+// String expName = tracker.getCurrentExperimentName();
+ String expName = tracker.getExperimentNameForDistributedDataCenter(AdaptationProcessModelLoader.getDistributedDataCenter());
logger.debug("Searching for impact of " + expName);
Impact latestImpact = PerfDataRepoConverter.convertObservableImpact(ObservationRepositoryHelper
.searchImpactOfTactic(expName, repository));
--
GitLab