Changeset 17229 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/Analyzers

Timestamp:

09/03/19 14:49:46 (5 years ago)

Author:

abeham

Message:

#2521: Refactored ParetoFrontScatterPlot (moved from TestFunctions.MultiObjective to Analysis)

• Introduced generic type that may work with all solution encodings

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/Analyzers/ScatterPlotAnalyzer.cs (modified) (5 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/Analyzers/ScatterPlotAnalyzer.cs

@@ -21 +21 @@
 
 using System.Linq;
+using HEAL.Attic;
+using HeuristicLab.Analysis;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Encodings.RealVectorEncoding;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HEAL.Attic;
 
 namespace HeuristicLab.Problems.TestFunctions.MultiObjective {
@@ -38 +38 @@
     }
 
-    public IResultParameter<ParetoFrontScatterPlot> ScatterPlotResultParameter {
-      get { return (IResultParameter<ParetoFrontScatterPlot>)Parameters["Scatterplot"]; }
+    public IResultParameter<ParetoFrontScatterPlot<RealVector>> ScatterPlotResultParameter {
+      get { return (IResultParameter<ParetoFrontScatterPlot<RealVector>>)Parameters["Scatterplot"]; }
     }
 
@@ -51 +51 @@
     public ScatterPlotAnalyzer() {
       Parameters.Add(new ScopeTreeLookupParameter<RealVector>("Individuals", "The individual solutions to the problem"));
-      Parameters.Add(new ResultParameter<ParetoFrontScatterPlot>("Scatterplot", "The scatterplot for the current and optimal (if known front)"));
+      Parameters.Add(new ResultParameter<ParetoFrontScatterPlot<RealVector>>("Scatterplot", "The scatterplot for the current and optimal (if known front)"));
     }
 
@@ -58 +58 @@
       var individuals = IndividualsParameter.ActualValue;
       var testFunction = TestFunctionParameter.ActualValue;
-      var objectives = qualities.Length != 0 ? qualities[0].Length:0;    
-      var problemSize = individuals.Length != 0 ? individuals[0].Length:0;
+      var objectives = qualities.Length != 0 ? qualities[0].Length:0;
 
       var optimalFront = new double[0][];               
@@ -71 +70 @@
       }
 
-      var qualityClones = qualities.Select(s => s.ToArray()).ToArray();
-      var solutionClones = individuals.Select(s => s.ToArray()).ToArray();
-
-      ScatterPlotResultParameter.ActualValue = new ParetoFrontScatterPlot(qualityClones, solutionClones, optimalFront, objectives, problemSize);
+      var fronts = DominationCalculator.CalculateAllParetoFronts(individuals.ToArray(), qualities.Select(x => x.ToArray()).ToArray(), testFunction.Maximization(objectives), out var rank);
+      
+      ScatterPlotResultParameter.ActualValue = new ParetoFrontScatterPlot<RealVector>(
+        fronts.Select(x => x.Select(y => y.Item2).ToArray()).ToArray(),
+        fronts.Select(x => x.Select(y => y.Item1).ToArray()).ToArray(),
+        optimalFront, objectives);
       return base.Apply();
     }