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

Timestamp:

11/21/16 15:52:53 (8 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/HypervolumeIndicator.cs (modified) (3 diffs)

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

@@ -26 +26 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.TestFunctions.MultiObjective;
@@ -32 +31 @@
   [Item("HypervolumeIndicator", "Selection of Offspring based on contributing Hypervolume")]
   [StorableClass]
-  class HypervolumeIndicator : Item, IIndicator {
+  internal class HypervolumeIndicator : Item, IIndicator {
 
-    public int LeastContributer<R>(R[] front, Func<R, double[]> extractor, MultiObjectiveTestFunctionProblem problem) {
-      DoubleMatrix bounds = problem.Bounds;
-      int mindex = 1;
-      double min = Double.MaxValue;
-      List<double[]> frontArr = front.Select(x => extractor.Invoke(x)).ToList<double[]>();
-      double[] refPoint = buildReference(frontArr, problem.Maximization);
-      refPoint = buildReference(refPoint, problem.TestFunction.ReferencePoint(problem.Objectives), problem.Maximization);
-      double hv = Hypervolume.Calculate(frontArr, refPoint, problem.Maximization);
-      for (int i = 0; i < frontArr.Count; i++) {
-        var d = Contribution(frontArr, i, problem.Maximization, refPoint, hv);
-        if (min > d) {
-          mindex = i;
-          min = d;
-        }
-      }
-
-      return mindex;
+    public int LeastContributer<TR>(IEnumerable<TR> front, Func<TR, double[]> extractor, MultiObjectiveTestFunctionProblem problem) {
+      var frontArr = front.Select(extractor.Invoke).ToList();
+      var refPoint = BuildReference(frontArr.Concat(new[] { problem.TestFunction.ReferencePoint(problem.Objectives) }), problem.Maximization);
+      var hv = Hypervolume.Calculate(frontArr, refPoint, problem.Maximization);
+      return Enumerable.Range(0, frontArr.Count).Select(i => Contribution(frontArr, i, problem.Maximization, refPoint, hv)).ArgMin();
     }
 
-    private double Contribution(List<double[]> front, int idx, bool[] maximization, double[] refPoint, double hv) {
+    private static double Contribution(IList<double[]> front, int idx, bool[] maximization, double[] refPoint, double hv) {
       var point = front[idx];
       front.RemoveAt(idx);
@@ -60 +47 @@
       return contribution;
     }
-
-    private double[] buildReference(IEnumerable<double[]> front, bool[] maximization) {
-      double[] refPoint = new double[maximization.Length];
-      foreach (double[] point in front) {
-        for (int i = 0; i < maximization.Length; i++) {
+    private static double[] BuildReference(IEnumerable<double[]> front, IReadOnlyList<bool> maximization) {
+      var refPoint = new double[maximization.Count];
+      foreach (var point in front)
+        for (var i = 0; i < maximization.Count; i++)
           refPoint[i] = maximization[i] ? Math.Min(refPoint[i], point[i]) : Math.Max(refPoint[i], point[i]);
-        }
-      }
       return refPoint;
-    }
-    private double[] buildReference(double[] point1, double[] point2, bool[] maximization) {
-      double[] refPoint = new double[maximization.Length];
-
-      for (int i = 0; i < maximization.Length; i++) {
-        refPoint[i] = maximization[i] ? Math.Min(point2[i], point1[i]) : Math.Max(point2[i], point1[i]);
-      }
-
-      return refPoint;
-    }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new HypervolumeIndicator(this, cloner);
     }
 
     [StorableConstructor]
     protected HypervolumeIndicator(bool deserializing) : base(deserializing) { }
-    protected HypervolumeIndicator(HypervolumeIndicator original, Cloner cloner)
-      : base(original, cloner) {
-    }
+    protected HypervolumeIndicator(HypervolumeIndicator original, Cloner cloner) : base(original, cloner) { }
+    public override IDeepCloneable Clone(Cloner cloner) { return new HypervolumeIndicator(this, cloner); }
     public HypervolumeIndicator() { }
   }