Changeset 14090 for branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Analyzers/HypervolumeAnalyzer.cs

Timestamp:

07/15/16 19:27:12 (8 years ago)

Author:

bwerth

Message:

#1087 several fixes according to the review comments 35 and 38

File:

• branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Analyzers/HypervolumeAnalyzer.cs (modified) (5 diffs)

branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Analyzers/HypervolumeAnalyzer.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -34 +35 @@
   public class HypervolumeAnalyzer : MOTFAnalyzer {
 
-    public ILookupParameter<DoubleArray> ReferencePointParameter {
-      get { return (ILookupParameter<DoubleArray>)Parameters["ReferencePoint"]; }
-    }
-
-    public IFixedValueParameter<DoubleValue> BestKnownHyperVolumeParameter {
-      get { return (IFixedValueParameter<DoubleValue>)Parameters["BestKnownHyperVolume"]; }
-    }
-
-    public double BestKnownHyperVolume {
-      get { return BestKnownHyperVolumeParameter.Value.Value; }
-      set { BestKnownHyperVolumeParameter.Value.Value = value; }
-    }
-
     [StorableConstructor]
     protected HypervolumeAnalyzer(bool deserializing) : base(deserializing) { }
@@ -57 +45 @@
     }
 
-    public HypervolumeAnalyzer() {
-      Parameters.Add(new LookupParameter<DoubleArray>("ReferencePoint", "The reference point for hypervolume calculation"));
-      Parameters.Add(new FixedValueParameter<DoubleValue>("BestKnownHyperVolume", "The currently best known hypervolume", new DoubleValue(0)));
-    }
+    public HypervolumeAnalyzer() { }
 
     public override IOperation Apply() {
@@ -66 +51 @@
       var qualities = QualitiesParameter.ActualValue;
       var testFunction = TestFunctionParameter.ActualValue;
-      var referencePoint = ReferencePointParameter.ActualValue;
       int objectives = qualities[0].Length;
-
-
+      var referencePoint = testFunction.ReferencePoint(objectives);
 
       if (!results.ContainsKey("Hypervolume")) results.Add(new Result("Hypervolume", typeof(DoubleValue)));
       if (!results.ContainsKey("Absolute Distance to BestKnownHypervolume")) results.Add(new Result("Absolute Distance to BestKnownHypervolume", typeof(DoubleValue)));
 
-      double best;
+      double best = testFunction.OptimalHypervolume(objectives);
       if (!results.ContainsKey("BestKnownHypervolume")) {
         results.Add(new Result("BestKnownHypervolume", typeof(DoubleValue)));
-        best = BestKnownHyperVolumeParameter.Value.Value;
-      } else {
-        best = ((DoubleValue)(results["BestKnownHypervolume"].Value)).Value;
       }
-
+      best = Math.Max(best, ((DoubleValue)(results["BestKnownHypervolume"].Value)).Value);
 
       IEnumerable<double[]> front = NonDominatedSelect.SelectNonDominatedVectors(qualities.Select(q => q.ToArray()), testFunction.Maximization(objectives), true);
 
-      double hv = front.Any() ? Hypervolume.Calculate(front, referencePoint.CloneAsArray(), testFunction.Maximization(objectives)) : 0;
-
+      double hv = Hypervolume.Calculate(front, (double[])referencePoint.Clone(), testFunction.Maximization(objectives));
 
       if (double.IsNaN(best) || best < hv) {
@@ -93 +72 @@
       }
 
-      results["Hypervolume"].Value = new DoubleValue(hv);
-      results["BestKnownHypervolume"].Value = new DoubleValue(best);
-      results["Absolute Distance to BestKnownHypervolume"].Value = new DoubleValue(best - hv);
+      ((DoubleValue)(results["Hypervolume"].Value)).Value = hv;
+      ((DoubleValue)(results["BestKnownHypervolume"].Value)).Value = best;
+      ((DoubleValue)(results["Absolute Distance to BestKnownHypervolume"].Value)).Value = best - hv;
 
       return base.Apply();