- 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

edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/WeightingFunctionHelperTest.java → edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/evaluation/weightingfunction/WeightingFunctionHelperTest.java

-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;

edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/ObjectivesHelperTest.java

+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));
+    }
+
+}