From 89b2af3673ce1ebea2863e1de0806b5bc78a7e2b Mon Sep 17 00:00:00 2001 From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de> Date: Thu, 26 Jun 2014 09:35:29 +0000 Subject: [PATCH] split *.descartes.model.repository package: - connector for performance data repositories has been moved to *.descartes.evaluation.performance - logic for handling model files will be moved to *.descartes.model git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/DMM/trunk@16124 9e42b895-fcda-4063-8a3b-11be15eb1bbd --- .../META-INF/MANIFEST.MF | 6 +++--- .../ipd/descartes/adaptation/AdaptationControl.java | 12 ++++++------ .../kit/ipd/descartes/adaptation/TacticExecutor.java | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/edu.kit.ipd.descartes.adaptation/META-INF/MANIFEST.MF b/edu.kit.ipd.descartes.adaptation/META-INF/MANIFEST.MF index a0241b71..32edd611 100644 --- a/edu.kit.ipd.descartes.adaptation/META-INF/MANIFEST.MF +++ b/edu.kit.ipd.descartes.adaptation/META-INF/MANIFEST.MF @@ -13,13 +13,13 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: edu.kit.ipd.descartes.adaptation.analysis, edu.kit.ipd.descartes.adaptation.analysis.pcm, edu.kit.ipd.descartes.adaptation.evaluation.performance, + edu.kit.ipd.descartes.adaptation.evaluation.performance.repository, + edu.kit.ipd.descartes.adaptation.model, edu.kit.ipd.descartes.adaptation.model.adaptation, edu.kit.ipd.descartes.adaptation.model.adaptation.dmm, edu.kit.ipd.descartes.adaptation.model.adaptation.dmm.util, edu.kit.ipd.descartes.adaptation.model.adaptation.exceptions, - edu.kit.ipd.descartes.adaptation.model.repository, - edu.kit.ipd.descartes.adaptation.model.repository.dmm, - edu.kit.ipd.descartes.adaptation.model.repository.perfdatarepo, + edu.kit.ipd.descartes.adaptation.model.dmm, edu.kit.ipd.descartes.ql.core.engine.query, edu.kit.ipd.descartes.ql.lang.descartesQL, edu.kit.ipd.descartes.ql.models.mapping.domain, 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 56cc2479..3413623d 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 @@ -14,18 +14,18 @@ import org.eclipse.emf.ecore.xmi.DanglingHREFException; import edu.kit.ipd.descartes.adaptation.analysis.IModelAnalyzer; import edu.kit.ipd.descartes.adaptation.evaluation.performance.IEvaluator; import edu.kit.ipd.descartes.adaptation.evaluation.performance.WeightingFunctionEvaluator; +import edu.kit.ipd.descartes.adaptation.evaluation.performance.repository.IPerformanceDataRepositoryHandler; +import edu.kit.ipd.descartes.adaptation.evaluation.performance.repository.ObservationRepositoryHelper; +import edu.kit.ipd.descartes.adaptation.evaluation.performance.repository.PerfDataRepoConverter; +import edu.kit.ipd.descartes.adaptation.evaluation.performance.repository.PerformanceDataRepositoryHandler; +import edu.kit.ipd.descartes.adaptation.evaluation.performance.repository.PerformanceDataRepositoryHandlerFactory; import edu.kit.ipd.descartes.adaptation.event.EventTypeEnum; import edu.kit.ipd.descartes.adaptation.model.adaptation.dmm.BlueYonderExperimentTracker; import edu.kit.ipd.descartes.adaptation.model.adaptation.dmm.DmmModelActionHandler; import edu.kit.ipd.descartes.adaptation.model.adaptation.dmm.TacticsHistory; import edu.kit.ipd.descartes.adaptation.model.adaptation.dmm.util.ObjectivesHelper; +import edu.kit.ipd.descartes.adaptation.model.dmm.DmlModelLoader; import edu.kit.ipd.descartes.adaptation.analysis.pcm.PcmModelAnalyzer; -import edu.kit.ipd.descartes.adaptation.model.repository.dmm.DmlModelLoader; -import edu.kit.ipd.descartes.adaptation.model.repository.perfdatarepo.IPerformanceDataRepositoryHandler; -import edu.kit.ipd.descartes.adaptation.model.repository.perfdatarepo.ObservationRepositoryHelper; -import edu.kit.ipd.descartes.adaptation.model.repository.perfdatarepo.PerfDataRepoConverter; -import edu.kit.ipd.descartes.adaptation.model.repository.perfdatarepo.PerformanceDataRepositoryHandler; -import edu.kit.ipd.descartes.adaptation.model.repository.perfdatarepo.PerformanceDataRepositoryHandlerFactory; import edu.kit.ipd.descartes.mm.adaptation.AdaptationProcess; import edu.kit.ipd.descartes.mm.adaptation.Event; import edu.kit.ipd.descartes.mm.adaptation.Strategy; diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/TacticExecutor.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/TacticExecutor.java index 13249436..1d9451c4 100644 --- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/TacticExecutor.java +++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/TacticExecutor.java @@ -16,7 +16,7 @@ import edu.kit.ipd.descartes.adaptation.model.adaptation.dmm.TacticsHistory; import edu.kit.ipd.descartes.adaptation.model.adaptation.dmm.util.OclEvaluationHelper; import edu.kit.ipd.descartes.adaptation.model.adaptation.exceptions.InvalidAdaptationPlan; import edu.kit.ipd.descartes.adaptation.model.adaptation.exceptions.OperationNotPerformedException; -import edu.kit.ipd.descartes.adaptation.model.repository.dmm.DmlModelLoader; +import edu.kit.ipd.descartes.adaptation.model.dmm.DmlModelLoader; import edu.kit.ipd.descartes.mm.adaptation.AbstractControlFlowElement; import edu.kit.ipd.descartes.mm.adaptation.Action; import edu.kit.ipd.descartes.mm.adaptation.ActionReference; -- GitLab