Changeset 14044 for branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Analyzers/ScatterPlotAnalyzer.cs

Timestamp:

07/12/16 18:20:50 (8 years ago)

Author:

mkommend

Message:

#1087: Refactored and improved analyzers for multi-objective test functions.

File:

• branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Analyzers/ScatterPlotAnalyzer.cs (modified) (4 diffs)

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

@@ -19 +19 @@
  */
 #endregion
+
 using System.Linq;
 using HeuristicLab.Common;
@@ -24 +25 @@
 using HeuristicLab.Encodings.RealVectorEncoding;
 using HeuristicLab.Optimization;
+using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -31 +33 @@
   public class ScatterPlotAnalyzer : MOTFAnalyzer {
 
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
+    public IScopeTreeLookupParameter<RealVector> IndividualsParameter {
+      get { return (IScopeTreeLookupParameter<RealVector>)Parameters["Individuals"]; }
     }
+
     [StorableConstructor]
     protected ScatterPlotAnalyzer(bool deserializing) : base(deserializing) { }
-    public ScatterPlotAnalyzer(ScatterPlotAnalyzer original, Cloner cloner) : base(original, cloner) {
-    }
+    protected ScatterPlotAnalyzer(ScatterPlotAnalyzer original, Cloner cloner) : base(original, cloner) { }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new ScatterPlotAnalyzer(this, cloner);
     }
 
-    public ScatterPlotAnalyzer() { }
+    public ScatterPlotAnalyzer() {
+      Parameters.Add(new ScopeTreeLookupParameter<RealVector>("Individuals", "The individual solutions to the problem"));
+    }
 
-    public override void Analyze(Individual[] individuals, double[][] qualities, ResultCollection results) {
-      if (qualities == null || qualities.Length < 1) return;
+    public override IOperation Apply() {
+      var results = ResultsParameter.ActualValue;
+      var qualities = QualitiesParameter.ActualValue;
+      var testFunction = TestFunctionParameter.ActualValue;
       int objectives = qualities[0].Length;
-      double[][] opf = new double[0][];
-      var optmialFront = TestFunctionParameter.ActualValue.OptimalParetoFront(objectives);
-
-      if (optmialFront != null) opf = optmialFront.Select(s => s.ToArray()).ToArray();
-      var qualityClones = qualities.Select(s => s.ToArray()).ToArray();
-      var solutionClones = individuals.Select(s => s.RealVector().ToArray()).ToArray();
+      var individuals = IndividualsParameter.ActualValue;
 
       if (!results.ContainsKey("Scatterplot")) {
@@ -58 +59 @@
       }
 
-      results["Scatterplot"].Value = new MOSolution(qualityClones, solutionClones, opf, objectives);
+      double[][] optimalFront = new double[0][];
+      var front = testFunction.OptimalParetoFront(objectives);
+      if (front != null) optimalFront = front.ToArray();
+
+      var qualityClones = qualities.Select(s => s.ToArray()).ToArray();
+      var solutionClones = individuals.Select(s => s.ToArray()).ToArray();
+
+      results["Scatterplot"].Value = new MOSolution(qualityClones, solutionClones, optimalFront, objectives);
+
+      return base.Apply();
     }
   }