Changeset 14030 for branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/MultiObjectiveTestfunctionTests

Timestamp:

07/08/16 15:30:46 (9 years ago)

Author:

bwerth

Message:

#1087 several fixes according to the reviev comments in comment 31

Location:

branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/MultiObjectiveTestfunctionTests

Files:

• CrowdingTest.cs (copied) (copied from branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/MultiObjectiveTestfunctionTests/SpacingTest.cs) (8 diffs)
• FastHyperVolumeTests.cs (modified) (4 diffs)
• MultiObjectiveTestfunctionTests.csproj (modified) (1 diff)
• SpacingTest.cs (modified) (1 diff)

branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/MultiObjectiveTestfunctionTests/CrowdingTest.cs

@@ -25 +25 @@
 namespace MultiObjectiveTestfunctionTests {
   [TestClass]
-  public class SpacingTest {
+  public class CrowdingTest {
 
     [TestMethod]
@@ -34 +34 @@
       double[][] front = { };
 
-      Spacing.Calculate(front);
+      Crowding.Calculate(front, null);
     }
 
@@ -50 +50 @@
       point1[1] = 0.5;
       double[][] front = { point, point1 };
-      double dist = Spacing.Calculate(front);
-      Assert.AreEqual(0, dist);
+      double dist = Crowding.Calculate(front, new double[,] { { 0, 1 }, { 0, 1 } });
+      Assert.AreEqual(double.PositiveInfinity, dist);
     }
 
@@ -62 +62 @@
       point[1] = 0;
       double[][] front = { point };
-      double dist = Spacing.Calculate(front);
-      Assert.AreEqual(0, dist);
+      double dist = Crowding.Calculate(front, new double[,] { { 0, 1 }, { 0, 1 } });
+      Assert.AreEqual(double.PositiveInfinity, dist);
     }
 
@@ -69 +69 @@
     [TestCategory("Problems.TestFunctions")]
     [TestProperty("Time", "short")]
-    public void QuadraticTest() {
+    public void DiagonalTest() {
       double[] point = new double[2];
       point[0] = 0;
       point[1] = 0;
       double[] point1 = new double[2];
-      point1[0] = 0;
-      point1[1] = 1;
+      point1[0] = 0.5;
+      point1[1] = 0.5;
 
       double[] point2 = new double[2];
       point2[0] = 1;
-      point2[1] = 0;
-      double[] point3 = new double[2];
-      point3[0] = 1;
-      point3[1] = 1;
-      double[][] front = { point, point1, point2, point3 };
-      double dist = Spacing.Calculate(front);
-      Assert.AreEqual(0, dist);
+      point2[1] = 1;
+      double[][] front = { point, point1, point2 };
+      double dist = Crowding.Calculate(front, new double[,] { { 0, 1 }, { 0, 1 } });
+      Assert.AreEqual(2, dist);
     }
 
@@ -91 +88 @@
     [TestCategory("Problems.TestFunctions")]
     [TestProperty("Time", "short")]
-    public void RectangularTest() {
+    public void DiamondTest() {
       double[] point = new double[2];
       point[0] = 0;
       point[1] = 0;
       double[] point1 = new double[2];
-      point1[0] = 0;
-      point1[1] = 1;
+      point1[0] = 1;
+      point1[1] = 1.5;
 
       double[] point2 = new double[2];
-      point2[0] = 2;
-      point2[1] = 0;
+      point2[0] = 3;
+      point2[1] = 0.5;
       double[] point3 = new double[2];
-      point3[0] = 2;
-      point3[1] = 1;
+      point3[0] = 4;
+      point3[1] = 2;
       double[][] front = { point, point1, point2, point3 };
-      double dist = Spacing.Calculate(front);
-      Assert.AreEqual(0, dist);
+      double dist = Crowding.Calculate(front, new double[,] { { 0, 2 }, { 0, 1 } }); ;
+      Assert.AreEqual(4.5, dist);
     }
 
     /// <summary> 
-    /// deltoid with 3 points of the 1-unit-square and the northeastern point at 4,4
-    /// which gives d=(1,1,1,5) for minimal distances. Mean of d is 2 and variance of d is 3
-    /// Spacing is defined as the standarddeviation of d
+    /// deltoid with 4 points of the 1-unit-square and the northeastern point at 4,4
+    /// 
     /// </summary>
     [TestMethod]
@@ -123 +119 @@
       point[1] = 0;
       double[] point1 = new double[2];
-      point1[0] = 0;
-      point1[1] = 1;
+      point1[0] = 0.00000001;         //points should not be exactly equal because sorting behaviour could change result
+      point1[1] = 1.00000001;
 
       double[] point2 = new double[2];
@@ -132 +128 @@
       point3[0] = 4;
       point3[1] = 4;
-      double[][] front = { point, point1, point2, point3 };
-      double dist = Spacing.Calculate(front);
-      Assert.AreEqual(Math.Sqrt(3), dist);
+
+
+      double[][] front = { point, point1, point2, point3, };
+      double dist = Crowding.Calculate(front, new double[,] { { 0, 4 }, { 0, 4 } });
+      Assert.AreEqual(1.25, dist);
     }
 

branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/MultiObjectiveTestfunctionTests/FastHyperVolumeTests.cs

@@ -46 +46 @@
       double[][] front = { point };
       double[] referencePoint = new double[] { 1, 1, 1 };
-      double hv = MultiDimensionalHypervolume.Calculate(front, referencePoint);
+      double hv = Hypervolume.Calculate(front, referencePoint, new bool[3]);
       Assert.AreEqual(0.125, hv);
     }
@@ -81 +81 @@
       referencePoint[1] = 1;
       referencePoint[2] = 1;
-      double hv = MultiDimensionalHypervolume.Calculate(front, referencePoint);
+      double hv = Hypervolume.Calculate(front, referencePoint, new bool[3]);
       double hv2 = 1;
       foreach (double d in point) {
@@ -109 +109 @@
 
       double[] referencePoint = new double[] { 1, 1, 1 };
-      double hv = MultiDimensionalHypervolume.Calculate(front, referencePoint);
+      double hv = Hypervolume.Calculate(front, referencePoint, new bool[3]);
       Assert.AreEqual(0.25, hv);
     }
@@ -127 +127 @@
       var front = NonDominatedSelect.selectNonDominatedVectors(points, maximization, true);
 
-      double dim3hv = MultiDimensionalHypervolume.Calculate(front, referencePoint);
+      double dim3hv = Hypervolume.Calculate(front, referencePoint, new bool[3]);
       double dim2hv = Hypervolume.Calculate(front, referencePoint, maximization);
 

branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/MultiObjectiveTestfunctionTests/MultiObjectiveTestfunctionTests.csproj

@@ -64 +64 @@
   <ItemGroup>
     <Compile Include="FastHyperVolumeTests.cs" />
+    <Compile Include="CrowdingTest.cs" />
     <Compile Include="SpacingTest.cs" />
     <Compile Include="InvertedGenerationalDistanceTest.cs" />

branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/MultiObjectiveTestfunctionTests/SpacingTest.cs

@@ -26 +26 @@
   [TestClass]
   public class SpacingTest {
+
 
     [TestMethod]