diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/perfdatarepo/IPerformanceDataRepositoryHandler.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/perfdatarepo/IPerformanceDataRepositoryHandler.java index 7e55c871ad63d9f703f2138cd7fa33db238f947c..7d0ca26e16c17d290ec47431e6fa6dd463512223 100644 --- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/perfdatarepo/IPerformanceDataRepositoryHandler.java +++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/perfdatarepo/IPerformanceDataRepositoryHandler.java @@ -1,16 +1,16 @@ package edu.kit.ipd.descartes.adaptation.model.perfdatarepo; +import edu.kit.ipd.descartes.mm.adaptation.WeightedTactic; import edu.kit.ipd.descartes.perfdatarepo.Impact; import edu.kit.ipd.descartes.perfdatarepo.Result; public interface IPerformanceDataRepositoryHandler { public void load(String modelFileUri); - public Impact getLatestImpact(); + public Impact getLatestImpact(WeightedTactic tactic); public Impact getImpactAt(int position); public Result getCurrentSystemState(); - } 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 7fcf38eb4a03cc4895f965c459af5486aa17f672..88f6b12943985aa614825f5a6ce6e4418162f6b2 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.apache.log4j.Logger; import org.eclipse.emf.common.util.URI; import edu.kit.ipd.descartes.adaptation.model.AbstractEcoreModelLoader; +import edu.kit.ipd.descartes.mm.adaptation.WeightedTactic; import edu.kit.ipd.descartes.perfdatarepo.Impact; import edu.kit.ipd.descartes.perfdatarepo.Result; import edu.kit.ipd.descartes.ql.models.repository.ObservationRepository; @@ -45,4 +46,12 @@ public class ObservationRepositoryHandler implements IPerformanceDataRepositoryH public Result getCurrentSystemState() { return convertResult(repository.getObservations().get(iteration)); } + + @Override + public Impact getLatestImpact(WeightedTactic tactic) { + String expName = ObservationRepositoryHelper.deriveExperimentName(tactic, iteration + 1); + Impact latestImpact = PerfDataRepoConverter.convertObservableImpact(ObservationRepositoryHelper + .searchImpactOfTactic(expName, repository)); + return latestImpact; + } } diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/perfdatarepo/PerformanceDataRepositoryHandler.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/perfdatarepo/PerformanceDataRepositoryHandler.java index f8cc30578b5ea12ee1a210582fe736b8567c5e61..10d227bb67d97eee7f08a9a51a01e83d6edf23e2 100644 --- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/perfdatarepo/PerformanceDataRepositoryHandler.java +++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/perfdatarepo/PerformanceDataRepositoryHandler.java @@ -4,6 +4,7 @@ import org.apache.log4j.Logger; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.URI; +import edu.kit.ipd.descartes.mm.adaptation.WeightedTactic; import edu.kit.ipd.descartes.perfdatarepo.Impact; import edu.kit.ipd.descartes.perfdatarepo.PerformanceDataRepository; import edu.kit.ipd.descartes.perfdatarepo.Result; @@ -54,4 +55,10 @@ public class PerformanceDataRepositoryHandler implements IPerformanceDataReposit return repository.getResultHistory().get(iteration); } + @Override + public Impact getLatestImpact(WeightedTactic tactic) { + // TODO Auto-generated method stub + return null; + } + }