diff --git a/edu.kit.ipd.descartes.adaptation/default.properties b/edu.kit.ipd.descartes.adaptation/default.properties index 4fde303a1e264303d7706957c20d0611cf8be045..59093e7a4ea247a78536b5925c5f95496f58b13b 100644 --- a/edu.kit.ipd.descartes.adaptation/default.properties +++ b/edu.kit.ipd.descartes.adaptation/default.properties @@ -1,15 +1,15 @@ #process.name=AdaptationEngine -#adaptationprocess.instance=/Users/nhuber/Documents/workspace/descartes/metamodel/edu.kit.ipd.descartes.adaptation.test/test_models/StaRepository.xmi +#adaptationprocess.instance=../edu.kit.ipd.descartes.adaptation.test/test_models/StaRepository.xmi #perfdatarepo.metamodel=edu.kit.ipd.descartes.perfdatarepo.PerformanceDataRepository -#perfdatarepo.instance=/Users/nhuber/Documents/workspace/descartes/metamodel/edu.kit.ipd.descartes.adaptation.test/test_models/PerformanceDataRepositoryDummy.xmi +#perfdatarepo.instance=../edu.kit.ipd.descartes.adaptation.test/test_models/PerformanceDataRepositoryDummy.xmi #process.maxiterations=2 ## The list of triggering events can be found in EventTypeEnum.java #event.type= #process.name=SEAMS_PushPull-v1 -#adaptationprocess.instance=/Users/nhuber/Documents/workspace/descartes/metamodel/Examples/SEAMS_Case_Study/pushpull.adaptation +#adaptationprocess.instance=../Examples/SEAMS_Case_Study/pushpull.adaptation #perfdatarepo.metamodel=edu.kit.ipd.descartes.perfdatarepo.PerformanceDataRepository -#perfdatarepo.instance=/Users/nhuber/Documents/workspace/descartes/metamodel/Examples/SEAMS_Case_Study/simucomresults.perfdatarepo +#perfdatarepo.instance=../Examples/SEAMS_Case_Study/simucomresults.perfdatarepo #process.maxiterations=2 ## The list of triggering events can be found in EventTypeEnum.java #event.type=SlaViolatedEvent @@ -23,17 +23,17 @@ #event.type=BottleneckFoundEvent #process.name=SEAMS_PushPull-v2 -#adaptationprocess.instance=/Users/nhuber/Documents/workspace/descartes/metamodel/edu.kit.ipd.descartes.adaptation.test/SEAMSv2_Case_Study/pushPullProcess.adaptation +#adaptationprocess.instance=../edu.kit.ipd.descartes.adaptation.test/SEAMSv2_Case_Study/pushPullProcess.adaptation #perfdatarepo.metamodel=edu.kit.ipd.descartes.perfdatarepo.PerformanceDataRepository -#perfdatarepo.instance=/Users/nhuber/Documents/workspace/descartes/metamodel/edu.kit.ipd.descartes.adaptation.test/SEAMSv2_Case_Study/simucom-simulationResults.perfdatarepo +#perfdatarepo.instance=../edu.kit.ipd.descartes.adaptation.test/SEAMSv2_Case_Study/simucom-simulationResults.perfdatarepo #process.maxiterations=2 ## The list of triggering events can be found in EventTypeEnum.java #event.type=SlaViolatedEvent process.name=SEAMS_PushPull-v1 -adaptationprocess.instance=/Users/nhuber/Documents/workspace/descartes/metamodel/Examples/SEAMS_Case_Study/pushpull.adaptation +adaptationprocess.instance=../Examples/SEAMS_Case_Study/pushpull.adaptation perfdatarepo.metamodel=edu.kit.ipd.descartes.perfdatarepo.PerformanceDataRepository -perfdatarepo.instance=/Users/nhuber/Documents/workspace/descartes/metamodel/Examples/SEAMS_Case_Study/simucomresults.perfdatarepo +perfdatarepo.instance=../Examples/SEAMS_Case_Study/simucomresults.perfdatarepo process.maxiterations=3 # The list of triggering events can be found in EventTypeEnum.java event.type=SlaViolatedEvent 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 dc6659697a0a8dd75e3d26bb43dc15d08b906708..0a40b6218adb5c640fb63b8d90485ab8c58c13c5 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 @@ -1,5 +1,6 @@ package edu.kit.ipd.descartes.adaptation; +import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.util.Properties; @@ -73,8 +74,9 @@ public class AdaptationControl { // load properties file loadProperties(propertiesFile); - // load required models - adaptationProcess = adaptationProcessModelLoader.load(URI.createFileURI(adaptationProcessXmiFilePath)); + // load required models, use absolute paht (http://www.jevon.org/wiki/Resolving_Proxy_EMF_Elements) + adaptationProcess = adaptationProcessModelLoader.load(URI.createFileURI(new File( + adaptationProcessXmiFilePath).getAbsolutePath())); perfDataRepoHandler = PerformanceDataRepositoryHandlerFactory.createHandler(pdrMetamodelType); perfDataRepoHandler.load(performanceDataRepoXmiFilePath); diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/AdaptationProcessModelLoader.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/AdaptationProcessModelLoader.java index 061b80aee9118c665bbefb8efc933de759e0e241..63b83c06d379231455525135ff93400c86edf071 100644 --- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/AdaptationProcessModelLoader.java +++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/AdaptationProcessModelLoader.java @@ -27,8 +27,11 @@ import edu.kit.ipd.descartes.mm.resourcelandscape.ResourcelandscapePackage; public class AdaptationProcessModelLoader extends AbstractEcoreModelLoader { - public static final EPackage[] DMM_EPACKAGES = new EPackage[] { ResourcelandscapePackage.eINSTANCE, - AdaptationpointsPackage.eINSTANCE, ContainerrepositoryPackage.eINSTANCE, AdaptationPackage.eINSTANCE }; + public static final EPackage[] DMM_EPACKAGES = new EPackage[] { + ResourcelandscapePackage.eINSTANCE, + AdaptationpointsPackage.eINSTANCE, + ContainerrepositoryPackage.eINSTANCE, + AdaptationPackage.eINSTANCE }; private static AdaptationProcessModelLoader instance = null; private static ChangeRecorder recorder = null;