switch to ObservationRepository

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

edu.kit.ipd.descartes.adaptation.model.analysis/META-INF/MANIFEST.MF

@@ -7,7 +7,6 @@ Bundle-Activator: edu.kit.ipd.descartes.adaptation.model.analysis.Activator
 Bundle-Vendor: Descartes Research Group
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: edu.kit.ipd.descartes.adaptation.evaluation.performance.repository,
- edu.kit.ipd.descartes.adaptation.model,
  edu.kit.ipd.descartes.adaptation.model.adaptation.dmm,
  edu.kit.ipd.descartes.adaptation.model.dmm,
  edu.kit.ipd.descartes.mm.resourcelandscape,

edu.kit.ipd.descartes.adaptation.model.analysis/src/edu/kit/ipd/descartes/adaptation/model/analysis/pcm/PcmModelAnalyzer.java

@@ -5,7 +5,6 @@ import org.apache.log4j.Logger;
 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.model.adaptation.dmm.BlueYonderExperimentTracker;
 import edu.kit.ipd.descartes.adaptation.model.analysis.IModelAnalyzer;
 import edu.kit.ipd.descartes.adaptation.model.dmm.DmlModelLoader;
@@ -30,15 +29,17 @@ public class PcmModelAnalyzer /*extends SimuComWorkflowLauncher*/ implements IMo
     @Override
     public Impact getLatestImpact() {
         
-        if (perfDataRepoHandler.getClass().getName() == PerformanceDataRepositoryHandler.class.getName())
-            return perfDataRepoHandler.getLatestImpact();
-        else {
-            String expName = BlueYonderExperimentTracker.getInstance().getExperimentNameForDistributedDataCenter(DmlModelLoader.getDistributedDataCenter());
+    	// TODO: Diese Prfung ist (noch) erforderlich weil fr BY eine etwas andere Struktur 
+    	// im PerformanceDataRepository verwendet wird
+    	if( ((ObservationRepository) perfDataRepoHandler.getRepository()).getIdentifier().contains("BlueYonder") ){
+    		String expName = BlueYonderExperimentTracker.getInstance().getExperimentNameForDistributedDataCenter(DmlModelLoader.getDistributedDataCenter());
             logger.debug("Searching for impact of " + expName);
             Impact latestImpact = PerfDataRepoConverter.convertObservableImpact(ObservationRepositoryHelper
                     .searchImpactOfTactic(expName, (ObservationRepository) perfDataRepoHandler.getRepository()));
             return latestImpact;
-        }
+    	} else {
+    		return perfDataRepoHandler.getLatestImpact();
+    	}
     }
 
 }