Changeset 16142 for branches

Timestamp:

09/14/18 14:53:42 (6 years ago)

Author:

lkammere

Message:

#2886: Fix refreshing of pareto front. Add test quality value to pareto front.

File:

• branches/2886_SymRegGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration/Analysis/BestSolutionAnalyzer.cs (modified) (5 diffs)

branches/2886_SymRegGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration/Analysis/BestSolutionAnalyzer.cs

@@ -47 +47 @@
     public static readonly string ParetoFrontSolutionsResultName = "Pareto Front Solutions";
 
+    public static readonly string ParetoFrontSolutionHistoryResultName = "";
+
     private static readonly ISymbolicDataAnalysisExpressionTreeInterpreter expressionTreeLinearInterpreter = new SymbolicDataAnalysisExpressionTreeLinearInterpreter();
 
@@ -109 +111 @@
           ? GetValue<double>(results[BestTrainingQualityResultName].Value)
           : 0.0;
+        bestR2 = double.IsNaN(bestR2)
+          ? 0.0
+          : bestR2;
+
         var bestComplexity = results.ContainsKey(BestComplexityResultName) ? GetValue<int>(results[BestComplexityResultName].Value) : int.MaxValue;
         var complexity = sentence.Complexity;
@@ -178 +184 @@
         var scatterPlot = new ScatterPlot(ParetoFrontAnalysisResultName, ParetoFrontAnalysisResultName);
         algorithm.Results.Add(new Result(ParetoFrontAnalysisResultName, scatterPlot));
-        scatterPlot.Rows.Add(new ScatterPlotDataRow());
+        scatterPlot.Rows.Add(new ScatterPlotDataRow("Training", "", Enumerable.Empty<Point2D<double>>()));
+        scatterPlot.Rows.Add(new ScatterPlotDataRow("Test", "", Enumerable.Empty<Point2D<double>>()));
 
         scatterPlot.VisualProperties.XAxisTitle = "Complexity";
         scatterPlot.VisualProperties.YAxisTitle = "R²";
-        scatterPlot.Rows.First().VisualProperties.PointSize = 10;
+        foreach (ScatterPlotDataRow scatterPlotDataRow in scatterPlot.Rows) {
+          scatterPlotDataRow.VisualProperties.PointSize = 10;
+        }
       }
 
       ItemList<DoubleArray> paretoFront = (ItemList<DoubleArray>)algorithm.Results[ParetoFrontResultName].Value;
-      ScatterPlotDataRow plot = ((ScatterPlot)algorithm.Results[ParetoFrontAnalysisResultName].Value).Rows.First();
+      ScatterPlotDataRow plotTraining = ((ScatterPlot)algorithm.Results[ParetoFrontAnalysisResultName].Value).Rows["Training"];
+      ScatterPlotDataRow plotTest = ((ScatterPlot)algorithm.Results[ParetoFrontAnalysisResultName].Value).Rows["Test"];
 
       // Delete solutions with higher rank, which are now dominated.
@@ -194 +204 @@
           double quality = paretoFront[i][1];
           if (quality <= currQuality) { // If existing solution is worse, delete it
-            RemovePoint(plot, currRank);
+            RemovePoint(plotTraining, currRank);
+            RemovePoint(plotTest, currRank);
             paretoFront.RemoveAt(i);
           } else { // Otherwise stop, since following solutions can only be better
@@ -205 +216 @@
 
       paretoFront.Insert(i, new DoubleArray(new double[] { currRank, currQuality }));
-      plot.Points.Add(new Point2D<double>(currRank, currQuality, solution));
+      plotTraining.Points.Add(new Point2D<double>(currRank, currQuality, solution));
+      plotTest.Points.Add(new Point2D<double>(currRank, solution.TestRSquared, solution));
+
     }