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 eb62e0cc5f1b3b202e6fd84c1149abddac2da035..03e860fc883305df92a35866e42a3ee916fc6db1 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));