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

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

@@ -196,7 +196,7 @@ public class AdaptationControl {
         else {
             // Check if tactic has made anything stupid, i.e., violates the objectives. If yes, undo
             // and/or assign bad weight.
-            if (evaluator.qosDegradationDetected(tactic)) {
+            if (evaluator.slaViolated(tactic)) {
                 logger.warn("QoS degradation detected after applying tactic " + tactic.getName());
                 executor.undoPreviousTactic();
                 evaluator.punishTactic(tactic);

edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/evaluation/IEvaluator.java

@@ -26,7 +26,7 @@ public interface IEvaluator {
      * @param tactic
      * @return
      */
-    public boolean qosDegradationDetected(WeightedTactic tactic);
+    public boolean slaViolated(WeightedTactic tactic);
 
     /**
      * Reduces the weight of the given tactic.

edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/evaluation/WeightingFunctionEvaluator.java

@@ -56,7 +56,7 @@ public class WeightingFunctionEvaluator implements IEvaluator {
         tactic.setCurrentWeight(newWeight);
     }
 
-    public boolean qosDegradationDetected(WeightedTactic tactic) {
+    public boolean slaViolated(WeightedTactic tactic) {
         Impact impact = tactic.getLastImpact();
         Result before = impact.getBefore();
         Result after = impact.getAfter();

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

@@ -5,7 +5,8 @@ import edu.kit.ipd.descartes.mm.adaptation.WeightedTactic;
 
 public class BlueYonderExperimentTracker implements IObserver {
 
-    private static final String RESULT_NAME = "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-$1Yps-desc4-gw-desc3-db-desc2-predict-Z ps=$2-req=5-size=50000";
+//    private static final String RESULT_NAME_TEMPLATE = "Xreq-par-$1Yps-desc4-gw-desc3-db-desc2-predict-Z ps=$2-req=40-size=500000";
     private static BlueYonderExperimentTracker instance = null;
     private int psOnDescOne = 0;
     private int psOnDescFour = 1;
@@ -17,12 +18,12 @@ public class BlueYonderExperimentTracker implements IObserver {
     }
 
     public String getCurrentExperimentName() {
-        String result = RESULT_NAME;
+        String result = RESULT_NAME_TEMPLATE;
 
         if (psOnDescOne > 0)
-            result = RESULT_NAME.replace("$1", psOnDescOne + "ps-desc1-");
+            result = RESULT_NAME_TEMPLATE.replace("$1", psOnDescOne + "ps-desc1-");
         else
-            result = RESULT_NAME.replace("$1", "");
+            result = RESULT_NAME_TEMPLATE.replace("$1", "");
 
         result = result.replace("$2", Integer.toString(psOnDescFour));
         return result;
@@ -43,14 +44,16 @@ public class BlueYonderExperimentTracker implements IObserver {
             }
         } else if (execTacticName.contains("Low")) {
             psOnDescOne++;
-            assert psOnDescFour > 0;
-            if (execTacticName.contains("Migrate"))
+            if (execTacticName.contains("Migrate")) {
+                assert psOnDescFour > 0;
                 psOnDescFour--;
+            }
         } else if (execTacticName.contains("High")) {
             psOnDescFour++;
-            assert psOnDescOne > 0;
-            if (execTacticName.contains("Migrate"))
+            if (execTacticName.contains("Migrate")) {
+                assert psOnDescOne > 0;
                 psOnDescOne--;
+            }
         }
     }