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 410ff945eee2b232dddceb1babca6868f9c31481..1b9ef67871545340d03618e2fc744d917be28e4b 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 @@ -2,7 +2,6 @@ package edu.kit.ipd.descartes.adaptation.model.perfdatarepo; import java.util.List; -import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.util.EcoreUtil; import edu.kit.ipd.descartes.mm.adaptation.WeightedTactic; @@ -12,15 +11,12 @@ import edu.kit.ipd.descartes.ql.models.repository.ObservationRepository; public class ObservationRepositoryHelper { - public static ObservableImpact searchImpactOfTactic(String name, String modelUri) { - ObservationRepositoryModelLoader loader = ObservationRepositoryModelLoader.getInstance(); - ObservationRepository repo = (ObservationRepository) loader.load(URI.createFileURI(modelUri)); - + public static ObservableImpact searchImpactOfTactic(String name, ObservationRepository repository) { // Get correct result - Observation o = getResultEndingWith(name, repo); + Observation o = getResultEndingWith(name, repository); // Derive impact from result - ObservableImpact i = deriveImpact(o, repo); + ObservableImpact i = getImpactForObservation(o, repository); return i; } @@ -42,7 +38,7 @@ public class ObservationRepositoryHelper { return null; } - private static ObservableImpact deriveImpact(Observation o, ObservationRepository repo) { + public static ObservableImpact getImpactForObservation(Observation o, ObservationRepository repo) { if (o == null || repo == null) return null;