Changeset 15086

Timestamp:

06/29/17 11:39:20 (7 years ago)

Author:

mkommend

Message:

#2783: Renamed individuals to solutions in DominationCalculator to be consistent with other methods.

Location:

trunk/sources

Files:

• HeuristicLab.Core.Views/3.3/CheckedItemListView.cs (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/MultiObjective/DominationCalculator.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Core.Views/3.3/CheckedItemListView.cs

@@ -106 +106 @@
       var data = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) as ICheckedItemList<T>;
       if (data != null)
-        validDragOperation = Content.Select(x => x.ToString()).SequenceEqual(data.Select(x => x.ToString()));
+        validDragOperation = true;
       else
         base.itemsListView_DragEnter(sender, e);
@@ -126 +126 @@
       var data = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) as ICheckedItemList<T>;
       if (data != null) {
-        for (int i = 0; i < Content.Count; i++) {
-          Content.SetItemCheckedState(Content[i], data.ItemChecked(data[i]));
+        for (int i = 0; i < data.Count; i++) {
+          var dataItem = data[i];
+          var contentItem = Content.FirstOrDefault(ci => ci.ToString() == dataItem.ToString());
+          if (contentItem == null) continue;
+          Content.SetItemCheckedState(contentItem, data.ItemChecked(dataItem));
         }
       } else

trunk/sources/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]));
           }
         }