fixed renaming issue

git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@12017 9e42b895-fcda-4063-8a3b-11be15eb1bbd

edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/AdaptationControl.java

@@ -19,8 +19,6 @@ import edu.kit.ipd.descartes.adaptation.model.dmm.AdaptationProcessModelLoader;
 import edu.kit.ipd.descartes.adaptation.model.dmm.DmmModelActionHandler;
 import edu.kit.ipd.descartes.adaptation.model.dmm.util.ObjectivesHelper;
 import edu.kit.ipd.descartes.adaptation.model.perfdatarepo.IPerformanceDataRepositoryHandler;
-import edu.kit.ipd.descartes.adaptation.model.perfdatarepo.ObservationRepositoryHelper;
-import edu.kit.ipd.descartes.adaptation.model.perfdatarepo.PerfDataRepoConverter;
 import edu.kit.ipd.descartes.adaptation.model.perfdatarepo.PerformanceDataRepositoryHandlerFactory;
 import edu.kit.ipd.descartes.mm.adaptation.AdaptationProcess;
 import edu.kit.ipd.descartes.mm.adaptation.Event;
@@ -46,7 +44,7 @@ public class AdaptationControl {
     private String eventType = null;
 
     private AdaptationProcessModelLoader adaptationProcessModelLoader = AdaptationProcessModelLoader.getInstance();
-    private IPerformanceDataRepositoryHandler perfdatarepo;
+    private IPerformanceDataRepositoryHandler perfDataRepoHandler;
     private AdaptationProcess adaptationProcess = null;
     private TacticExecutor executor = null;
     private IModelAnalyzer modelAnalyzer = null;
@@ -76,8 +74,8 @@ public class AdaptationControl {
 
             // load required models
             adaptationProcess = adaptationProcessModelLoader.load(URI.createFileURI(adaptationProcessXmiFilePath));
-            perfdatarepo = PerformanceDataRepositoryHandlerFactory.createHandler(pdrMetamodelType);
-            perfdatarepo.load(performanceDataRepoXmiFilePath);
+            perfDataRepoHandler = PerformanceDataRepositoryHandlerFactory.createHandler(pdrMetamodelType);
+            perfDataRepoHandler.load(performanceDataRepoXmiFilePath);
 
             // set handlers
             executor = new TacticExecutor(new DmmModelActionHandler());
@@ -95,7 +93,7 @@ public class AdaptationControl {
         Logger.getRootLogger().setLevel(Level.DEBUG);
 
         AdaptationControl adaptationController = new AdaptationControl();
-        // Initialize controller (load models, create Action perfdatarepo, etc.)
+        // Initialize controller (load models, create Action perfDataRepoHandler, etc.)
         adaptationController.init(propertiesfile);
         Event triggeringEvent = adaptationController.findTriggeringEvent();
 
@@ -148,7 +146,7 @@ public class AdaptationControl {
      * @return
      */
     public boolean isObjectiveFulfilled() {
-        boolean flag = ObjectivesHelper.isObjectiveFulfilled(cause, perfdatarepo.getCurrentSystemState());
+        boolean flag = ObjectivesHelper.isObjectiveFulfilled(cause, perfDataRepoHandler.getCurrentSystemState());
         if (flag)
             logger.info("Problem that caused event " + cause.getName() + " has been solved, Objective is fulfilled.");
         return flag;
@@ -178,10 +176,9 @@ public class AdaptationControl {
      */
     public void processResults(WeightedTactic tactic) {
 
-//        Impact latestImpact = perfdatarepo.getImpactAt(iteration);
-        String expName = ObservationRepositoryHelper.deriveExperimentName(tactic, iteration + 1);
-        Impact latestImpact = PerfDataRepoConverter.convertObservableImpact(ObservationRepositoryHelper
-                .searchImpactOfTactic(expName, performanceDataRepoXmiFilePath));
+//        Impact latestImpact = perfDataRepoHandler.getImpactAt(iteration);
+        Impact latestImpact = perfDataRepoHandler.getLatestImpact(tactic);
+        
         // Connect parsed results to the executed tactic
         if (latestImpact != null)
             tactic.setLastImpact(latestImpact);