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

Timestamp:

07/18/16 13:50:08 (7 years ago)

Author:

bwerth

Message:

#1087 removed NormalizedHypervolumeAnalyzer and IMOFrontModel.cs, refactored ScatterPlotAnalyzer ,fixed bug in HypervolumeAnalyzer

File:

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

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

@@ -35 +35 @@
   public class HypervolumeAnalyzer : MOTFAnalyzer {
 
+    public ILookupParameter<DoubleArray> ReferencePointParameter {
+      get { return (ILookupParameter<DoubleArray>)Parameters["ReferencePoint"]; }
+    }
+
     [StorableConstructor]
-    protected HypervolumeAnalyzer(bool deserializing) : base(deserializing) { }
+    protected HypervolumeAnalyzer(bool deserializing) : base(deserializing) {
+    }
 
     protected HypervolumeAnalyzer(HypervolumeAnalyzer original, Cloner cloner)
@@ -45 +50 @@
     }
 
-    public HypervolumeAnalyzer() { }
+    public HypervolumeAnalyzer() {
+      Parameters.Add(new LookupParameter<DoubleArray>("ReferencePoint", "The reference point for hypervolume calculation"));
+    }
 
     public override IOperation Apply() {
@@ -52 +59 @@
       var testFunction = TestFunctionParameter.ActualValue;
       int objectives = qualities[0].Length;
-      var referencePoint = testFunction.ReferencePoint(objectives);
+      var referencePoint = ReferencePointParameter.ActualValue;
 
-      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)));
+      if (!results.ContainsKey("Hypervolume")) results.Add(new Result("Hypervolume", new DoubleValue(0)));
+      if (!results.ContainsKey("Absolute Distance to BestKnownHypervolume")) results.Add(new Result("Absolute Distance to BestKnownHypervolume", new DoubleValue(0)));
 
       double best = testFunction.OptimalHypervolume(objectives);
       if (!results.ContainsKey("BestKnownHypervolume")) {
-        results.Add(new Result("BestKnownHypervolume", typeof(DoubleValue)));
+        results.Add(new Result("BestKnownHypervolume", new DoubleValue(0)));
+      } else {
+        best = Math.Max(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 = Hypervolume.Calculate(front, (double[])referencePoint.Clone(), testFunction.Maximization(objectives));
+      double hv = Hypervolume.Calculate(front, referencePoint.ToArray(), testFunction.Maximization(objectives));
 
       if (double.IsNaN(best) || best < hv) {