Changeset 13620 for branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/NonDominatedSelect.cs

Timestamp:

02/15/16 17:19:34 (8 years ago)

Author:

bwerth

Message:

#1087 regorganized testfunctions, added view for qualities

File:

• branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/NonDominatedSelect.cs (modified) (3 diffs)

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

@@ -21 +21 @@
 
 using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Core;
-using HeuristicLab.Encodings.RealVectorEncoding;
 
-namespace HeuristicLab.Problems.MultiObjectiveTestFunction {
+namespace HeuristicLab.Problems.MultiObjectiveTestFunctions {
 
   public class NonDominatedSelect {
@@ -30 +30 @@
 
 
-    public static RealVector[] selectNonDominatedVectors(RealVector[] qualities, bool[] maximization, bool dominateOnEqualQualities) {
-      int populationSize = qualities.Length;
+    public static IEnumerable<double[]> selectNonDominatedVectors(IEnumerable<double[]> qualities, bool[] maximization, bool dominateOnEqualQualities) {
+      int populationSize = qualities.Count();
 
-      List<RealVector> front = new List<RealVector>();
-      foreach (RealVector row in qualities) {
+      List<double[]> front = new List<double[]>();
+      foreach (double[] row in qualities) {
         bool insert = true;
         for (int i = 0; i < front.Count; i++) {
@@ -44 +44 @@
         }
         if (insert) {
-          front.Add(new RealVector(row));
+          front.Add(row);
         }
       }
 
-      return front.ToArray();
+      return front;
     }
 
-    public static RealVector[] selectNonDominatedRows(double[][] qualities, bool[] maximization, bool dominateOnEqualQualities) {
-      int populationSize = qualities.Length;
-
-      List<RealVector> front = new List<RealVector>();
-      foreach (double[] row in qualities) {
-        bool insert = true;
-        for (int i = 0; i < front.Count; i++) {
-          DominationResult res = Dominates(front[i], row, maximization, dominateOnEqualQualities);
-          if (res == DominationResult.Dominates) { insert = false; break; }           //Vector domiates Row
-          else if (res == DominationResult.IsDominated) {   //Row dominates Vector
-            front.RemoveRange(i, 1);
-          } 
-        }
-        if (insert) {
-          front.Add(new RealVector(row));
-        }
-      }
-
-      return front.ToArray();
-    }
-
-    private static DominationResult Dominates(RealVector left, double[] right, bool[] maximizations, bool dominateOnEqualQualities) {
-      //mkommend Caution: do not use LINQ.SequenceEqual for comparing the two quality arrays (left and right) due to performance reasons
-      if (dominateOnEqualQualities) {
-        var equal = true;
-        for (int i = 0; i < left.Length; i++) {
-          if (left[i] != right[i]) {
-            equal = false;
-            break;
-          }
-        }
-        if (equal) return DominationResult.Dominates;
-      }
-
-      bool leftIsBetter = false, rightIsBetter = false;
-      for (int i = 0; i < left.Length; i++) {
-        if (IsDominated(left[i], right[i], maximizations[i])) rightIsBetter = true;
-        else if (IsDominated(right[i], left[i], maximizations[i])) leftIsBetter = true;
-        if (leftIsBetter && rightIsBetter) break;
-      }
-
-      if (leftIsBetter && !rightIsBetter) return DominationResult.Dominates;
-      if (!leftIsBetter && rightIsBetter) return DominationResult.IsDominated;
-      return DominationResult.IsNonDominated;
-    }
-
-    private static DominationResult Dominates(RealVector left, RealVector right, bool[] maximizations, bool dominateOnEqualQualities) {
+    private static DominationResult Dominates(double[] left, double[] right, bool[] maximizations, bool dominateOnEqualQualities) {
       //mkommend Caution: do not use LINQ.SequenceEqual for comparing the two quality arrays (left and right) due to performance reasons
       if (dominateOnEqualQualities) {