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

Timestamp:

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

Author:

mkommend

Message:

#1087: Refactored utility class NonDominatedSelect.

File:

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

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) {