Changeset 15109 for stable/HeuristicLab.Optimization/3.3/MultiObjective

Timestamp:

07/03/17 09:40:13 (7 years ago)

Author:

abeham

Message:

#2783: merged r15051,r15080,r15086,r15087 to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Optimization (modified) (1 prop)
• HeuristicLab.Optimization/3.3/MultiObjective (copied) (copied from trunk/sources/HeuristicLab.Optimization/3.3/MultiObjective)
• HeuristicLab.Optimization/3.3/MultiObjective/DominationCalculator.cs (modified) (5 diffs)

stable/HeuristicLab.Optimization/3.3/MultiObjective/DominationCalculator.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using HeuristicLab.Core;
-using HeuristicLab.Data;
 
 namespace HeuristicLab.Optimization {
@@ -100 +98 @@
     }
 
-    private static List<Tuple<T, double[]>> CalculateBestFront(T[] individuals, double[][] qualities, bool[] maximization, bool dominateOnEqualQualities, int populationSize, out Dictionary<T, List<int>> dominatedIndividuals, out int[] dominationCounter, out int[] rank) {
+    private static List<Tuple<T, double[]>> CalculateBestFront(T[] solutions, double[][] qualities, bool[] maximization, bool dominateOnEqualQualities, int populationSize, out Dictionary<T, List<int>> dominatedIndividuals, out int[] dominationCounter, out int[] rank) {
       var front = new List<Tuple<T, double[]>>();
       dominatedIndividuals = new Dictionary<T, List<int>>();
@@ -106 +104 @@
       rank = new int[populationSize];
       for (int pI = 0; pI < populationSize - 1; pI++) {
-        var p = individuals[pI];
+        var p = solutions[pI];
         List<int> dominatedIndividualsByp;
         if (!dominatedIndividuals.TryGetValue(p, out dominatedIndividualsByp))
@@ -117 +115 @@
           } else if (test == DominationResult.IsDominated) {
             dominationCounter[pI] += 1;
-            if (!dominatedIndividuals.ContainsKey(individuals[qI]))
-              dominatedIndividuals.Add(individuals[qI], new List<int>());
-            dominatedIndividuals[individuals[qI]].Add(pI);
+            if (!dominatedIndividuals.ContainsKey(solutions[qI]))
+              dominatedIndividuals.Add(solutions[qI], new List<int>());
+            dominatedIndividuals[solutions[qI]].Add(pI);
           }
           if (pI == populationSize - 2
@@ -125 +123 @@
             && dominationCounter[qI] == 0) {
             rank[qI] = 0;
-            front.Add(Tuple.Create(individuals[qI], qualities[qI]));
+            front.Add(Tuple.Create(solutions[qI], qualities[qI]));
           }
         }