From 7bd66747233a95125713ed5864537edbcd3dfa18 Mon Sep 17 00:00:00 2001 From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de> Date: Fri, 12 Apr 2013 14:40:41 +0000 Subject: [PATCH] - removed copy of template configuration when creating a clone of a template - adjusted calculated weight due to changes in performance data repository git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@11177 9e42b895-fcda-4063-8a3b-11be15eb1bbd --- .../adaptation/model/dmm/util/DmmModelChangerTest.java | 2 -- .../adaptation/weightingfunction/WeightedSumCalculatorTest.java | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/DmmModelChangerTest.java b/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/DmmModelChangerTest.java index 9b9534e2..0d7c3336 100644 --- a/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/DmmModelChangerTest.java +++ b/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/DmmModelChangerTest.java @@ -142,8 +142,6 @@ public class DmmModelChangerTest extends AbstractTest { assertEquals(original.getName() + DmmModelChanger.COPY_MARK, copy.getName()); assertEquals(original.getTemplate(), copy.getTemplate()); - assertTrue(EcoreUtil.equals(original.getTemplate().getTemplateConfig(), copy.getConfigSpec())); - assertTrue(original.getTemplate().getReferringContainers().contains(copy)); assertTrue(parent.getContains().size() == 2); diff --git a/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/weightingfunction/WeightedSumCalculatorTest.java b/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/weightingfunction/WeightedSumCalculatorTest.java index c270296f..6fdb827e 100644 --- a/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/weightingfunction/WeightedSumCalculatorTest.java +++ b/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/weightingfunction/WeightedSumCalculatorTest.java @@ -136,7 +136,7 @@ public class WeightedSumCalculatorTest extends AbstractTest { testFunction.getWeightedMetrics().add(wm); } - assertEquals(-9.5602, wSumCalc.calculateWeight(wt), 0.0001); + assertEquals(-187.9888, wSumCalc.calculateWeight(wt), 0.0001); } private List<MetricType> getMetricTypesFromModel() { -- GitLab