Changeset 14081 for branches

Timestamp:

07/15/16 10:31:06 (8 years ago)

Author:

mkommend

Message:

#1087: Refactored utility class NonDominatedSelect.

Location:

branches/HeuristicLab.Problems.MultiObjectiveTestFunctions

Files:

• HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Analyzers/HypervolumeAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Analyzers/NormalizedHypervolumeAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Calculators/HyperVolume.cs (modified) (1 diff)
• HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/NonDominatedSelect.cs (modified) (4 diffs)
• MultiObjectiveTestfunctionTests/CrowdingTest.cs (modified) (1 diff)
• MultiObjectiveTestfunctionTests/FastHyperVolumeTests.cs (modified) (1 diff)
• MultiObjectiveTestfunctionTests/HyperVolumeTests.cs (modified) (2 diffs)

branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Analyzers/HypervolumeAnalyzer.cs

@@ -91 +91 @@
 
 
-      IEnumerable<double[]> front = NonDominatedSelect.selectNonDominatedVectors(qualities.Select(q => q.ToArray()), testFunction.Maximization(objectives), true);
+      IEnumerable<double[]> front = NonDominatedSelect.SelectNonDominatedVectors(qualities.Select(q => q.ToArray()), testFunction.Maximization(objectives), true);
 
       double hv = front.Any() ? Hypervolume.Calculate(front, testFunction.ReferencePoint(objectives), testFunction.Maximization(objectives)) : 0;

branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Analyzers/NormalizedHypervolumeAnalyzer.cs

@@ -82 +82 @@
       }
 
-      IEnumerable<double[]> front = NonDominatedSelect.selectNonDominatedVectors(qualities.Select(q => q.ToArray()), testFunction.Maximization(objectives), true);
+      IEnumerable<double[]> front = NonDominatedSelect.SelectNonDominatedVectors(qualities.Select(q => q.ToArray()), testFunction.Maximization(objectives), true);
 
       if (!results.ContainsKey(resultsHV)) results.Add(new Result(resultsHV, typeof(DoubleValue)));

branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Calculators/HyperVolume.cs

@@ -53 +53 @@
     /// 
     public static double Calculate(IEnumerable<double[]> front, double[] referencePoint, bool[] maximization) {
-      front = NonDominatedSelect.removeNonReferenceDominatingVectors(front, referencePoint, maximization, false);
+      front = NonDominatedSelect.GetDominatingVectors(front, referencePoint, maximization, false);
       if (maximization.Length == 2)
         return Calculate2D(front, referencePoint, maximization);

branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/NonDominatedSelect.cs

@@ -21 +21 @@
 
 using System.Collections.Generic;
-using System.Linq;
 
 namespace HeuristicLab.Problems.MultiObjectiveTestFunctions {
@@ -28 +27 @@
     public enum DominationResult { Dominates, IsDominated, IsNonDominated };
 
-    public static IEnumerable<double[]> selectNonDominatedVectors(IEnumerable<double[]> qualities, bool[] maximization, bool dominateOnEqualQualities) {
-      int populationSize = qualities.Count();
+    public static IEnumerable<double[]> SelectNonDominatedVectors(IEnumerable<double[]> qualities, bool[] maximization, bool dominateOnEqualQualities) {
 
       List<double[]> front = new List<double[]>();
@@ -38 +36 @@
           if (res == DominationResult.Dominates) { insert = false; break; }           //Vector domiates Row
           else if (res == DominationResult.IsDominated) {   //Row dominates Vector
-            front.RemoveRange(i, 1);
+            front.RemoveAt(i);
           }
         }
@@ -49 +47 @@
     }
 
-    public static IEnumerable<double[]> removeNonReferenceDominatingVectors(IEnumerable<double[]> qualities, double[] reference, bool[] maximization, bool dominateOnEqualQualities) {
+    public static IEnumerable<double[]> GetDominatingVectors(IEnumerable<double[]> qualities, double[] reference, bool[] maximization, bool dominateOnEqualQualities) {
       List<double[]> front = new List<double[]>();
       foreach (double[] vec in qualities) {

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

@@ -103 +103 @@
       point3[1] = 2;
       double[][] front = { point, point1, point2, point3 };
-      double dist = Crowding.Calculate(front, new double[,] { { 0, 2 }, { 0, 1 } }); ;
+      double dist = Crowding.Calculate(front, new double[,] { { 0, 2 }, { 0, 1 } });
       Assert.AreEqual(4.5, dist);
     }

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

@@ -125 +125 @@
         points.Add(p);
       }
-      var front = NonDominatedSelect.selectNonDominatedVectors(points, maximization, true);
+      var front = NonDominatedSelect.SelectNonDominatedVectors(points, maximization, true);
 
       double dim3hv = Hypervolume.Calculate(front, referencePoint, new bool[3]);

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

@@ -179 +179 @@
       referencePoint[0] = 0;
       referencePoint[1] = 1;
-      double nw = Hypervolume.Calculate(NonDominatedSelect.selectNonDominatedVectors(front, maximization, true), referencePoint, maximization);
+      double nw = Hypervolume.Calculate(NonDominatedSelect.SelectNonDominatedVectors(front, maximization, true), referencePoint, maximization);
       Assert.AreEqual(1, nw);
 
@@ -193 +193 @@
       referencePoint[0] = 1;
       referencePoint[1] = 0;
-      double se = Hypervolume.Calculate(NonDominatedSelect.selectNonDominatedVectors(front, maximization, true), referencePoint, maximization);
+      double se = Hypervolume.Calculate(NonDominatedSelect.SelectNonDominatedVectors(front, maximization, true), referencePoint, maximization);
       Assert.AreEqual(1, se);