diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/util/BlueYonderExperimentTracker.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/util/BlueYonderExperimentTracker.java index e1f0116999c966775e3f2751bdcd609b177ee1ff..44f0d26582e059381a85878fd0f3056faf3f2463 100644 --- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/util/BlueYonderExperimentTracker.java +++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/util/BlueYonderExperimentTracker.java @@ -8,7 +8,7 @@ import edu.kit.ipd.descartes.mm.resourcelandscape.DistributedDataCenter; 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-$1Yps-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=40-size=500000"; private static BlueYonderExperimentTracker instance = null; private int psOnDescOne = 0; private int psOnDescFour = 1; @@ -36,7 +36,12 @@ public class BlueYonderExperimentTracker implements IObserver { backupValues(); if (execTacticName.contains("Consolidate")) { - int loopCount = Integer.parseInt(tactic.getUsedTactic().getInputParams().get(0).getValue()); + int loopCount = 1; + try { + loopCount = Integer.parseInt(tactic.getUsedTactic().getInputParams().get(0).getValue()); + } catch (Exception e) { + + } if (execTacticName.contains("Low")) { psOnDescFour = psOnDescFour - loopCount; psOnDescOne = psOnDescOne + loopCount; @@ -95,9 +100,14 @@ public class BlueYonderExperimentTracker implements IObserver { String result = RESULT_NAME_TEMPLATE; if (psInstances[0] > 0) - result = RESULT_NAME_TEMPLATE.replace("$1", psInstances[0] + "ps-desc1-"); + result = result.replace("$1", psInstances[0] + "ps-desc1-"); else - result = RESULT_NAME_TEMPLATE.replace("$1", ""); + result = result.replace("$1", ""); + + if (psInstances[1] > 0) + result = result.replace("$3", psInstances[1] + "ps-desc2-"); + else + result = result.replace("$3", ""); result = result.replace("$2", Integer.toString(psInstances[3])); return result;