Changeset 13771 for branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/MultiObjectiveTestFunctionProblem.cs

Timestamp:

04/18/16 10:50:15 (8 years ago)

Author:

bwerth

Message:

#1087 bugfix + additional relative HV calculation added

File:

• branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/MultiObjectiveTestFunctionProblem.cs (modified) (6 diffs)

branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/MultiObjectiveTestFunctionProblem.cs

@@ -161 +161 @@
     }
 
+    public IEnumerable<double[]> BestKnownFront {
+      get {
+        return Parameters.ContainsKey("BestKnownFront") ? TestFunction.OptimalParetoFront(Objectives) : null;
+      }
+    }
+
     public double[] Evaluate(RealVector individual, IRandom random) {
       return TestFunction.Evaluate(individual, Objectives);
@@ -228 +234 @@
         || ProblemSize > TestFunction.MaximumSolutionLength)
         ProblemSize = Math.Min(TestFunction.MaximumSolutionLength, Math.Max(TestFunction.MinimumSolutionLength, ProblemSize));
+
+
       Parameterize();
     }
@@ -244 +252 @@
       Operators.Add(new SpacingAnalyzer());
       Operators.Add(new ScatterPlotAnalyzer());
+      Operators.Add(new NormalizedHypervolumeAnalyzer());
       ParameterizeAnalyzers();
       Parameterize();
@@ -250 +259 @@
     private void Parameterize() {
       MaximizationParameter.ActualValue = new BoolArray(Maximization);
+      var front = BestKnownFront;
+      if (front != null) { BestKnownFrontParameter.ActualValue = new DoubleMatrix(To2D(front.ToArray<double[]>())); }
+
     }
 
@@ -259 +271 @@
         analyzer.BestKnownFrontParameter.ActualName = BestKnownFrontParameter.Name;
 
-        BestKnownFrontParameter.ActualValue = new DoubleMatrix(To2D(TestFunction.OptimalParetoFront(Objectives).ToArray<double[]>()));
+
+        var front = BestKnownFront;
+        if (front != null) { BestKnownFrontParameter.ActualValue = new DoubleMatrix(To2D(front.ToArray<double[]>())); }
+
+
         if (analyzer is HypervolumeAnalyzer) {
           ((HypervolumeAnalyzer)analyzer).ReferencePointParameter.Value = new DoubleArray(TestFunction.ReferencePoint(Objectives));
@@ -265 +281 @@
         }
 
+        if (analyzer is NormalizedHypervolumeAnalyzer) {
+          ((NormalizedHypervolumeAnalyzer)analyzer).OptimalFrontParameter.ActualValue = (DoubleMatrix)BestKnownFrontParameter.ActualValue;
+        }
+
       }
     }