Changeset 15203 for trunk/sources/HeuristicLab.Algorithms.MOCMAEvolutionStrategy

Timestamp:

07/11/17 19:36:03 (7 years ago)

Author:

pfleck

Message:

#2592

• Renamed ScatterPlotContent to ParetoFrontScatterPlot (also renamed corresponding view).
• Refactored ParetoFrontScatterPlotView (use ScatterPlot internally).

File:

• trunk/sources/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3/MOCMAEvolutionStrategy.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3/MOCMAEvolutionStrategy.cs

@@ -245 +245 @@
       set { Results[CurrentFrontResultName].Value = value; }
     }
-    private ScatterPlotContent ResultsScatterPlot {
-      get { return (ScatterPlotContent)Results[ScatterPlotResultName].Value; }
+    private ParetoFrontScatterPlot ResultsScatterPlot {
+      get { return (ParetoFrontScatterPlot)Results[ScatterPlotResultName].Value; }
       set { Results[ScatterPlotResultName].Value = value; }
     }
@@ -353 +353 @@
       Results.Add(new Result(TimetableResultName, "Different quality meassures in a timeseries", table));
       Results.Add(new Result(CurrentFrontResultName, "The current front", new DoubleMatrix()));
-      Results.Add(new Result(ScatterPlotResultName, "A scatterplot displaying the evaluated solutions and (if available) the analytically optimal front", new ScatterPlotContent(null, null, null, 2)));
+      Results.Add(new Result(ScatterPlotResultName, "A scatterplot displaying the evaluated solutions and (if available) the analytically optimal front", new ParetoFrontScatterPlot()));
 
       var problem = Problem as MultiObjectiveTestFunctionProblem;
@@ -361 +361 @@
         ResultsDifferenceBestKnownHypervolume = ResultsBestKnownHypervolume;
       }
-      ResultsScatterPlot = new ScatterPlotContent(new double[0][], new double[0][], problem.BestKnownFront.ToJaggedArray(), problem.Objectives);
+      ResultsScatterPlot = new ParetoFrontScatterPlot(new double[0][], new double[0][], problem.BestKnownFront.ToJaggedArray(), problem.Objectives, problem.ProblemSize);
     }
     #endregion
@@ -470 +470 @@
 
     private void Analyze() {
-      ResultsScatterPlot = new ScatterPlotContent(solutions.Select(x => x.Fitness).ToArray(), solutions.Select(x => x.Mean.ToArray()).ToArray(), ResultsScatterPlot.ParetoFront, ResultsScatterPlot.Objectives);
+      ResultsScatterPlot = new ParetoFrontScatterPlot(solutions.Select(x => x.Fitness).ToArray(), solutions.Select(x => x.Mean.ToArray()).ToArray(), ResultsScatterPlot.ParetoFront, ResultsScatterPlot.Objectives, ResultsScatterPlot.ProblemSize);
       ResultsSolutions = solutions.Select(x => x.Mean.ToArray()).ToMatrix();