Changeset 16310 for branches/2943_MOBasicProblem_MOCMAES/HeuristicLab.Analysis/3.3/MultiObjective/HypervolumeAnalyzer.cs

Timestamp:

11/20/18 14:53:51 (5 years ago)

Author:

bwerth

Message:

#2943 worked on MOBasicProblem and MOAnalyzers

Location:

branches/2943_MOBasicProblem_MOCMAES/HeuristicLab.Analysis

Files:

• . (modified) (1 prop)
• 3.3/MultiObjective/HypervolumeAnalyzer.cs (copied) (copied from branches/2943_MOBasicProblem_MOCMAES/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/Analyzers/HypervolumeAnalyzer.cs) (3 diffs)

branches/2943_MOBasicProblem_MOCMAES/HeuristicLab.Analysis/3.3/MultiObjective/HypervolumeAnalyzer.cs

@@ -30 +30 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.TestFunctions.MultiObjective {
+namespace HeuristicLab.Analysis {
   [StorableClass]
   [Item("HypervolumeAnalyzer", "Computes the enclosed Hypervolume between the current front and a given reference Point")]
-  public class HypervolumeAnalyzer : MOTFAnalyzer {
+  public class HypervolumeAnalyzer : MultiObjectiveSuccessAnalyzer {
+    public override string ResultName => "Hypervolume";
 
-    public ILookupParameter<DoubleArray> ReferencePointParameter {
-      get { return (ILookupParameter<DoubleArray>)Parameters["ReferencePoint"]; }
-    }
-    public IResultParameter<DoubleValue> HypervolumeResultParameter {
-      get { return (IResultParameter<DoubleValue>)Parameters["Hypervolume"]; }
-    }
-    public IResultParameter<DoubleValue> BestKnownHypervolumeResultParameter {
-      get { return (IResultParameter<DoubleValue>)Parameters["Best known hypervolume"]; }
-    }
-    public IResultParameter<DoubleValue> HypervolumeDistanceResultParameter {
-      get { return (IResultParameter<DoubleValue>)Parameters["Absolute Distance to BestKnownHypervolume"]; }
-    }
+    public ILookupParameter<DoubleArray> ReferencePointParameter => (ILookupParameter<DoubleArray>)Parameters["ReferencePoint"];
+
+    public IResultParameter<DoubleValue> BestKnownHypervolumeResultParameter => (IResultParameter<DoubleValue>)Parameters["Best known hypervolume"];
+
+    public IResultParameter<DoubleValue> HypervolumeDistanceResultParameter => (IResultParameter<DoubleValue>)Parameters["Absolute Distance to BestKnownHypervolume"];
 
 
     [StorableConstructor]
-    protected HypervolumeAnalyzer(bool deserializing)
-      : base(deserializing) {
-    }
+    protected HypervolumeAnalyzer(bool deserializing) : base(deserializing) {}
 
-    protected HypervolumeAnalyzer(HypervolumeAnalyzer original, Cloner cloner)
-      : base(original, cloner) {
-    }
+    protected HypervolumeAnalyzer(HypervolumeAnalyzer original, Cloner cloner) : base(original, cloner) {}
+
     public override IDeepCloneable Clone(Cloner cloner) {
       return new HypervolumeAnalyzer(this, cloner);
@@ -63 +54 @@
     public HypervolumeAnalyzer() {
       Parameters.Add(new LookupParameter<DoubleArray>("ReferencePoint", "The reference point for hypervolume calculation"));
-      Parameters.Add(new ResultParameter<DoubleValue>("Hypervolume", "The hypervolume of the current generation"));
+      Parameters.Add(new ResultParameter<DoubleValue>("Hypervolume", "The hypervolume of the current generation", "Results", new DoubleValue(double.NaN)));
       Parameters.Add(new ResultParameter<DoubleValue>("Best known hypervolume", "The optimal hypervolume"));
       Parameters.Add(new ResultParameter<DoubleValue>("Absolute Distance to BestKnownHypervolume", "The difference between the best known and the current hypervolume"));
-      HypervolumeResultParameter.DefaultValue = new DoubleValue(0);
-      BestKnownHypervolumeResultParameter.DefaultValue = new DoubleValue(0);
-      HypervolumeDistanceResultParameter.DefaultValue = new DoubleValue(0);
-
-
+      BestKnownHypervolumeResultParameter.DefaultValue = new DoubleValue(double.NaN);
+      HypervolumeDistanceResultParameter.DefaultValue = new DoubleValue(double.NaN);
     }
 
     public override IOperation Apply() {
-      var qualities = QualitiesParameter.ActualValue;
-      var testFunction = TestFunctionParameter.ActualValue;
-      var objectives = qualities[0].Length;
-      var referencePoint = ReferencePointParameter.ActualValue;
+      var qualities = QualitiesParameter.ActualValue.Select(x => x.CloneAsArray()).ToArray();
+      var referencePoint = ReferencePointParameter.ActualValue.ToArray();
+      var best = BestKnownHypervolumeResultParameter.ActualValue.Value;
+      var maximization = MaximizationParameter.ActualValue.ToArray();
 
-      var best = BestKnownHypervolumeResultParameter.ActualValue.Value;
-      if (referencePoint.SequenceEqual(testFunction.ReferencePoint(objectives))) {
-        best = Math.Max(best, testFunction.OptimalHypervolume(objectives));
-      }
-
-      var hv = HypervolumeCalculator.CalculateHypervolume(qualities.Select(x=>x.CloneAsArray()).ToArray(), referencePoint.ToArray(), testFunction.Maximization(objectives));
-
-      if (hv > best) {
-        best = hv;
-      }
-
-      HypervolumeResultParameter.ActualValue.Value = hv;
+      var hv = HypervolumeCalculator.CalculateHypervolume(qualities, referencePoint, maximization);
+      if (hv > best || double.IsNaN(best)) best = hv;
+      ResultParameter.ActualValue.Value = hv;
       BestKnownHypervolumeResultParameter.ActualValue.Value = best;
       HypervolumeDistanceResultParameter.ActualValue.Value = best - hv;
@@ -96 +75 @@
       return base.Apply();
     }
-
   }
 }