Changeset 14404 for branches/MOCMAEvolutionStrategy/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3/CrowdingIndicator.cs

Timestamp:

11/21/16 15:52:53 (7 years ago)

Author:

bwerth

Message:

#2592 several fixes and cleanups to adapt a more HeuristicLab-Code-Style + renaming of folders and Plugin

Location:

branches

Files:

• . (modified) (1 prop)
• MOCMAEvolutionStrategy (moved) (moved from branches/HeuristicLab.Algorithms.CMAEvolutionStrategy)
• MOCMAEvolutionStrategy/HeuristicLab.Algorithms.MOCMAEvolutionStrategy (copied) (copied from branches/HeuristicLab.Algorithms.CMAEvolutionStrategy/sources)
• MOCMAEvolutionStrategy/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3 (copied) (copied from branches/HeuristicLab.Algorithms.CMAEvolutionStrategy/sources/MOCMAES)
• MOCMAEvolutionStrategy/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3/CrowdingIndicator.cs (modified) (2 diffs)

branches/MOCMAEvolutionStrategy/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3/CrowdingIndicator.cs

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Data;
 using System;
+using System.Collections.Generic;
 using System.Linq;
+using HeuristicLab.Common;
+using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Core;
-using HeuristicLab.Common;
 using HeuristicLab.Problems.TestFunctions.MultiObjective;
 
@@ -31 +31 @@
   [Item("CrowdingIndicator", "Selection of Offspring based on CrowdingDistance")]
   [StorableClass]
-  class CrowdingIndicator : Item, IIndicator {
+  internal class CrowdingIndicator : Item, IIndicator {
 
+    public int LeastContributer<TR>(IEnumerable<TR> front, Func<TR, double[]> extractor, MultiObjectiveTestFunctionProblem problem) {
+      var bounds = problem.Bounds;
+      var extracted = front.Select(extractor.Invoke).ToArray();
+      var pointsums = new double[extracted.Length];
 
-    public int LeastContributer<R>(R[] front, Func<R, double[]> extractor, MultiObjectiveTestFunctionProblem problem) {
-      DoubleMatrix bounds = problem.Bounds;
-      int mindex = 1;
-      double min = Double.MaxValue;
-      double[] pointsums = new double[front.Count()];
-
-      for (int dim = 0; dim < problem.Objectives; dim++) {
-        double[] arr = front.Select(x => extractor.Invoke(x)[dim]).ToArray();
+      for (var dim = 0; dim < problem.Objectives; dim++) {
+        var arr = extracted.Select(x => x[dim]).ToArray();
         Array.Sort(arr);
-        double fmax = problem.Bounds[dim % bounds.Rows, 1];
-        double fmin = bounds[dim % bounds.Rows, 0];
-        int pointIdx = 0;
-        foreach (R point in front) {
-          double d = 0;
-          int pos = Array.BinarySearch(arr, extractor.Invoke(point)[dim]);
-
-          d = pos != 0 && pos != arr.Count() - 1 ? (arr[pos + 1] - arr[pos - 1]) / (fmax - fmin) : Double.PositiveInfinity;
+        var fmax = problem.Bounds[dim % bounds.Rows, 1];
+        var fmin = bounds[dim % bounds.Rows, 0];
+        var pointIdx = 0;
+        foreach (var point in extracted) {
+          var pos = Array.BinarySearch(arr, point[dim]);
+          var d = pos != 0 && pos != arr.Length - 1 ? (arr[pos + 1] - arr[pos - 1]) / (fmax - fmin) : double.PositiveInfinity;
           pointsums[pointIdx] += d;
-
-
           pointIdx++;
         }
       }
       //find min
-      for (int pointIdx = 0; pointIdx < pointsums.Length; pointIdx++) {
-        double d = pointsums[pointIdx];
-        if (!Double.IsInfinity(d) && min > d) {
-          mindex = pointIdx;
-          min = d;
-        }
-      }
-
-      return mindex;
-    }
-
-
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new CrowdingIndicator(this, cloner);
+      return pointsums.Where(x => !double.IsInfinity(x)).ArgMin();
     }
 
     [StorableConstructor]
     protected CrowdingIndicator(bool deserializing) : base(deserializing) { }
-    protected CrowdingIndicator(CrowdingIndicator original, Cloner cloner)
-      : base(original, cloner) {
-    }
+    protected CrowdingIndicator(CrowdingIndicator original, Cloner cloner) : base(original, cloner) { }
+    public override IDeepCloneable Clone(Cloner cloner) { return new CrowdingIndicator(this, cloner); }
     public CrowdingIndicator() { }
   }