From f56ef395b1e83f6633d33fa573c2f68773309dc0 Mon Sep 17 00:00:00 2001
From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de>
Date: Tue, 14 May 2013 11:23:23 +0000
Subject: [PATCH] moved to new package
git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@11540 9e42b895-fcda-4063-8a3b-11be15eb1bbd
---
.../IWeightingFunctionCalculator.java | 24 -------
.../RandomWeightCalculator.java | 19 ------
.../WeightedSumCalculator.java | 62 -------------------
3 files changed, 105 deletions(-)
delete mode 100644 edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/weightingfunction/IWeightingFunctionCalculator.java
delete mode 100644 edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/weightingfunction/RandomWeightCalculator.java
delete mode 100644 edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/weightingfunction/WeightedSumCalculator.java
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/weightingfunction/IWeightingFunctionCalculator.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/weightingfunction/IWeightingFunctionCalculator.java
deleted file mode 100644
index 72068f51..00000000
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/weightingfunction/IWeightingFunctionCalculator.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package edu.kit.ipd.descartes.adaptation.weightingfunction;
-
-import edu.kit.ipd.descartes.mm.adaptation.Tactic;
-import edu.kit.ipd.descartes.mm.adaptation.WeightedTactic;
-
-public interface IWeightingFunctionCalculator {
-
- /**
- * Calculates the new weight of the given {@link Tactic}.
- *
- * @param impact
- * @return
- */
- double calculateWeight(WeightedTactic weightedTactic);
-
- /**
- * Calculates and sets the new weight of the given {@link WeightedTactic}.
- *
- * @param impact
- * @return
- */
- void updateWeight(WeightedTactic weightedTactic);
-
-}
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/weightingfunction/RandomWeightCalculator.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/weightingfunction/RandomWeightCalculator.java
deleted file mode 100644
index 244fae63..00000000
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/weightingfunction/RandomWeightCalculator.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package edu.kit.ipd.descartes.adaptation.weightingfunction;
-
-import java.util.Random;
-
-import edu.kit.ipd.descartes.mm.adaptation.WeightedTactic;
-
-public class RandomWeightCalculator implements IWeightingFunctionCalculator {
-
- @Override
- public double calculateWeight(WeightedTactic weightedTactic) {
- Random r = new Random(System.currentTimeMillis());
- return r.nextDouble();
- }
-
- @Override
- public void updateWeight(WeightedTactic weightedTactic) {
- weightedTactic.setCurrentWeight(calculateWeight(weightedTactic));
- }
-}
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/weightingfunction/WeightedSumCalculator.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/weightingfunction/WeightedSumCalculator.java
deleted file mode 100644
index 0770ba64..00000000
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/weightingfunction/WeightedSumCalculator.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package edu.kit.ipd.descartes.adaptation.weightingfunction;
-
-import org.apache.log4j.Logger;
-import org.eclipse.emf.common.util.EList;
-
-import edu.kit.ipd.descartes.adaptation.model.dmm.util.WeightingFunctionHelper;
-import edu.kit.ipd.descartes.mm.adaptation.WeightedTactic;
-import edu.kit.ipd.descartes.mm.adaptation.WeightingFunction;
-import edu.kit.ipd.descartes.perfdatarepo.Impact;
-import edu.kit.ipd.descartes.perfdatarepo.MetricValue;
-import edu.kit.ipd.descartes.perfdatarepo.Result;
-
-public class WeightedSumCalculator implements IWeightingFunctionCalculator {
-
- private Logger logger = Logger.getLogger(WeightedSumCalculator.class);
- private WeightingFunction weightingFunction = null;
-
- public WeightedSumCalculator(WeightingFunction weightingFunction) {
- this.weightingFunction = weightingFunction;
- }
-
- @Override
- public double calculateWeight(WeightedTactic weightedtactic) {
-
- double newWeight = 0.0;
- Impact impact = weightedtactic.getLastImpact();
- Result before = impact.getBefore();
- Result after = impact.getAfter();
- EList<MetricValue> afterMetricValues = after.getMetricValues();
-
- for (MetricValue afterMetricValue : afterMetricValues) {
- // calculated delta=(after-before)
- double afterValue = afterMetricValue.getValue();
- double beforeValue = WeightingFunctionHelper
- .getValueForMetricType(afterMetricValue.getMetricType(), before);
- double delta = afterValue - beforeValue;
-
- // get the corresponding weight
- double weightOfMetric = WeightingFunctionHelper.getWeightForMetricType(weightingFunction,
- afterMetricValue.getMetricType());
-
- if (Double.isNaN(weightOfMetric))
- logger.info("No weight found for metric type: " + afterMetricValue.getMetricType().getName() + ", skipping...");
- else {
- // add it
- newWeight += weightOfMetric * delta;
- logger.debug("Delta for metric type " + afterMetricValue.getMetricType().getName() + " was: " + delta
- + " and weight is " + weightOfMetric);
- }
- }
-
- return newWeight;
- }
-
- @Override
- public void updateWeight(WeightedTactic weightedTactic) {
- double newWeight = calculateWeight(weightedTactic);
- logger.debug("Setting new weight of " + weightedTactic.getName() + " to " + newWeight);
- weightedTactic.setCurrentWeight(newWeight);
- }
-
-}
--
GitLab