From 4905c19929a17bb253516f234b370cf1f4ae3f1b Mon Sep 17 00:00:00 2001
From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de>
Date: Wed, 29 May 2013 12:28:23 +0000
Subject: [PATCH] - refactorings - improved specification of objectives
git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@11803 9e42b895-fcda-4063-8a3b-11be15eb1bbd
---
.../WeightingFunctionHelperTest.java | 4 +--
.../model/dmm/util/ObjectivesHelperTest.java | 30 +++++++++++++++++++
2 files changed, 32 insertions(+), 2 deletions(-)
rename edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/{model/dmm/util => evaluation/weightingfunction}/WeightingFunctionHelperTest.java (97%)
create mode 100644 edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/ObjectivesHelperTest.java
diff --git a/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/WeightingFunctionHelperTest.java b/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/evaluation/weightingfunction/WeightingFunctionHelperTest.java
similarity index 97%
rename from edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/WeightingFunctionHelperTest.java
rename to edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/evaluation/weightingfunction/WeightingFunctionHelperTest.java
index 2f99604f..25cbf237 100644
--- a/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/WeightingFunctionHelperTest.java
+++ b/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/evaluation/weightingfunction/WeightingFunctionHelperTest.java
@@ -1,4 +1,4 @@
-package edu.kit.ipd.descartes.adaptation.model.dmm.util;
+package edu.kit.ipd.descartes.adaptation.evaluation.weightingfunction;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -12,7 +12,7 @@ import org.eclipse.emf.common.util.URI;
import org.junit.Before;
import org.junit.Test;
-import edu.kit.ipd.descartes.adaptation.model.dmm.util.WeightingFunctionHelper;
+import edu.kit.ipd.descartes.adaptation.evaluation.weightingfunction.WeightingFunctionHelper;
import edu.kit.ipd.descartes.adaptation.model.perfdatarepo.PerfDataRepoConverter;
import edu.kit.ipd.descartes.adaptation.model.perfdatarepo.PerformanceDataRepositoryModelLoader;
import edu.kit.ipd.descartes.mm.adaptation.AdaptationFactory;
diff --git a/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/ObjectivesHelperTest.java b/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/ObjectivesHelperTest.java
new file mode 100644
index 00000000..8fe0c893
--- /dev/null
+++ b/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/ObjectivesHelperTest.java
@@ -0,0 +1,30 @@
+package edu.kit.ipd.descartes.adaptation.model.dmm.util;
+
+import static org.junit.Assert.*;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import edu.kit.ipd.descartes.adaptation.AbstractTest;
+import edu.kit.ipd.descartes.mm.adaptation.RelationalOperator;
+
+public class ObjectivesHelperTest extends AbstractTest {
+
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ }
+
+ @Test
+ public void testCompare() {
+ Double one = 1.0d;
+ Double two = 2.0d;
+ assertTrue(ObjectivesHelper.compare(one, one, RelationalOperator.EQUAL));
+ assertTrue(ObjectivesHelper.compare(one, two, RelationalOperator.NOT_EQUAL));
+ assertTrue(ObjectivesHelper.compare(one, two, RelationalOperator.LESS));
+ assertTrue(ObjectivesHelper.compare(two, two, RelationalOperator.LESS_EQUAL));
+ assertTrue(ObjectivesHelper.compare(two, one, RelationalOperator.GREATER));
+ assertTrue(ObjectivesHelper.compare(two, two, RelationalOperator.GREATER_EQUAL));
+ }
+
+}
--
GitLab