diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/evaluation/weightingfunction/WeightedSumCalculator.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/evaluation/weightingfunction/WeightedSumCalculator.java index 9ce75b18be7d977012196e81020edd6a0444529f..3b25a9ec03bcc908e1f2819b19c47f4212241ae6 100644 --- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/evaluation/weightingfunction/WeightedSumCalculator.java +++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/evaluation/weightingfunction/WeightedSumCalculator.java @@ -51,7 +51,7 @@ public class WeightedSumCalculator implements IWeightingFunctionCalculator { afterMetricValue.getMetricType()); if (Double.isNaN(weightOfMetric)) - logger.info("No weight found for metric type: " + afterMetricValue.getMetricType().getName() + ", skipping..."); + logger.debug("WeightingFunction "+ weightingFunction.getName()+" hos no weight specified for metric type " + afterMetricValue.getMetricType().getName() + ". Skipping..."); else { // add it newWeight += weightOfMetric * delta; diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/WeightingFunctionHelper.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/WeightingFunctionHelper.java index c0770084bad4fa1b54d39752442c30fcc27afc5a..7a3d953d6ce6b51e5daf98405698223d3f609271 100644 --- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/WeightingFunctionHelper.java +++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/WeightingFunctionHelper.java @@ -1,5 +1,6 @@ package edu.kit.ipd.descartes.adaptation.model.dmm.util; +import org.apache.log4j.Logger; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.util.EcoreUtil; @@ -10,6 +11,8 @@ import edu.kit.ipd.descartes.perfdatarepo.MetricValue; import edu.kit.ipd.descartes.perfdatarepo.Result; public class WeightingFunctionHelper { + + static Logger logger = Logger.getLogger(WeightingFunctionHelper.class); /** * @@ -24,6 +27,10 @@ public class WeightingFunctionHelper { for (WeightedMetric weightedMetric : weightedMetrics) { if (EcoreUtil.equals(weightedMetric.getMetricType(), metricType)) return weightedMetric.getWeight(); + else if (weightedMetric.getMetricType().getName().equals(metricType.getName())) { + logger.debug("Could not find identical metric, using matching name instead"); + return weightedMetric.getWeight(); + } } return Double.NaN;