observation name is now derived from resource landscape model

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

edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/util/BlueYonderExperimentTracker.java

@@ -9,6 +9,7 @@ public class BlueYonderExperimentTracker implements IObserver {
 
     private static final String RESULT_NAME_TEMPLATE = "Xreq-par-$1Yps-desc4-gw-desc3-db-desc2-predict-Z ps=$2-req=5-size=50000";
 //    private static final String RESULT_NAME_TEMPLATE = "Xreq-par-$1$3Yps-desc4-gw-desc3-db-desc2-predict-Z ps=$2-req=40-size=500000";
+//    private static final String RESULT_NAME_TEMPLATE = "Xreq-par-$1$3Yps-desc4-gw-desc3-db-desc2-predict-Z ps=$2-req=30-size=500000";
     private static BlueYonderExperimentTracker instance = null;
     private int psOnDescOne = 0;
     private int psOnDescFour = 1;
@@ -86,13 +87,15 @@ public class BlueYonderExperimentTracker implements IObserver {
     }
 
     public String getExperimentNameForDistributedDataCenter(DistributedDataCenter distributedDataCenter) {
-        int[] psInstances = new int[4];
+        int[] psInstances = new int[4]; // 4 because currently we have 4 machines in the BY scenario
         
         for (int i = 0; i < psInstances.length; i++)
         {
             try {
+                // Count number of instances on the desc1 - desc4 machines
                 psInstances[i] = ((ComputingInfrastructure) distributedDataCenter.getConsistsOf().get(0).getContains().get(i)).getContains().size();
             } catch (Exception e) {
+                // If machine does not exist, there are also no instances on it
                 psInstances[i] = 0;
             }
         }
@@ -104,8 +107,8 @@ public class BlueYonderExperimentTracker implements IObserver {
         else
             result = result.replace("$1", "");
         
-        if (psInstances[1] > 0)
-            result = result.replace("$3", psInstances[1] + "ps-desc2-");
+        if (psInstances[1] > 1) // subtract 1 instance because GW/DB is also running here
+            result = result.replace("$3", (psInstances[1] - 1) + "ps-desc2-");
         else
             result = result.replace("$3", "");