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

Timestamp:

07/15/16 14:14:50 (8 years ago)

Author:

mkommend

Message:

#1087: Further refactoring of testfunction problem and analyzers.

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

@@ -65 +65 @@
     public override bool[] Maximization {
       get {
-        //necessary because of virtual member call in base ctor to this property
-        if (!Parameters.ContainsKey("TestFunction")) return new bool[2];
-        return TestFunction.Maximization(Objectives);
+        if (!Parameters.ContainsKey("Maximization")) return new bool[2];
+        return MaximizationParameter.Value.ToArray();
       }
     }
@@ -87 +86 @@
       set { TestFunctionParameter.Value = value; }
     }
-    public IEnumerable<double[]> BestKnownFront {
-      get { return Parameters.ContainsKey("BestKnownFront") ? TestFunction.OptimalParetoFront(Objectives) : null; }
+    public DoubleArray ReferencePoint {
+      get { return ReferencePointParameter.Value; }
+      set { ReferencePointParameter.Value = value; }
+    }
+    public DoubleMatrix BestKnownFront {
+      get { return BestKnownFrontParameter.Value; }
+      set { BestKnownFrontParameter.Value = value; }
     }
     #endregion
@@ -112 +116 @@
       Parameters.Add(new FixedValueParameter<IntValue>("Objectives", "The dimensionality of the solution vector (number of objectives).", new IntValue(2)));
       Parameters.Add(new ValueParameter<DoubleMatrix>("Bounds", "The bounds of the solution given as either one line for all variables or a line for each variable. The first column specifies lower bound, the second upper bound.", new DoubleMatrix(new double[,] { { -4, 4 } })));
+      Parameters.Add(new ValueParameter<DoubleArray>("ReferencePoint", "The reference point used for hypervolume calculation."));
       Parameters.Add(new ValueParameter<IMultiObjectiveTestFunction>("TestFunction", "The function that is to be optimized.", new Fonseca()));
       Parameters.Add(new ValueParameter<DoubleMatrix>("BestKnownFront", "The currently best known Pareto front"));
@@ -165 +170 @@
     #region Events
     private void UpdateParameterValues() {
-      MaximizationParameter.ActualValue = (BoolArray)new BoolArray(Maximization).AsReadOnly();
-      var front = BestKnownFront;
-      if (front != null) { BestKnownFrontParameter.Value = (DoubleMatrix)new DoubleMatrix(To2D(front.ToArray())).AsReadOnly(); }
-
+      MaximizationParameter.Value = (BoolArray)new BoolArray(TestFunction.Maximization(Objectives)).AsReadOnly();
+
+      var front = TestFunction.OptimalParetoFront(Objectives);
+      if (front != null) {
+        BestKnownFrontParameter.Value = (DoubleMatrix)new DoubleMatrix(To2D(front.ToArray())).AsReadOnly();
+      } else BestKnownFrontParameter.Value = null;
+
+
+      BoundsParameter.Value = new DoubleMatrix(TestFunction.Bounds(Objectives));
+      ReferencePointParameter.Value = new DoubleArray(TestFunction.ReferencePoint(Objectives));
     }
 
@@ -186 +197 @@
       Objectives = Math.Max(TestFunction.MinimumObjectives, Math.Min(Objectives, TestFunction.MaximumObjectives));
 
-      Bounds = (DoubleMatrix)new DoubleMatrix(TestFunction.Bounds(Objectives)).Clone();
       ParameterizeAnalyzers();
       UpdateParameterValues();
@@ -228 +238 @@
         analyzer.BestKnownFrontParameter.ActualName = BestKnownFrontParameter.Name;
 
+        var crowdingAnalyzer = analyzer as CrowdingAnalyzer;
+        if (crowdingAnalyzer != null) {
+          crowdingAnalyzer.BoundsParameter.ActualName = BoundsParameter.Name;
+        }
+
         var hyperVolumeAnalyzer = analyzer as HypervolumeAnalyzer;
         if (hyperVolumeAnalyzer != null) {
-          hyperVolumeAnalyzer.ReferencePointParameter.Value = new DoubleArray(TestFunction.ReferencePoint(Objectives));
-          hyperVolumeAnalyzer.BestKnownHyperVolume = TestFunction.BestKnownHypervolume(Objectives);
+          hyperVolumeAnalyzer.ReferencePointParameter.ActualName = ReferencePointParameter.Name;
+          hyperVolumeAnalyzer.BestKnownHyperVolume = TestFunction.OptimalHypervolume(Objectives);
         }