Changeset 16090

Timestamp:

08/28/18 11:27:43 (6 years ago)

Author:

lkammere

Message:

#2886: Explicitely store all pareto-optimal RegressionSolution objects at the end of the algorithm.

File:

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

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

@@ -45 +45 @@
     public static readonly string ParetoFrontResultName = "Pareto Front";
     public static readonly string ParetoFrontAnalysisResultName = "Pareto Front Analysis";
+    public static readonly string ParetoFrontSolutionsResultName = "Pareto Front Solutions";
 
     private static readonly ISymbolicDataAnalysisExpressionTreeInterpreter expressionTreeLinearInterpreter = new SymbolicDataAnalysisExpressionTreeLinearInterpreter();
@@ -62 +63 @@
     public void Deregister(GrammarEnumerationAlgorithm algorithm) {
       algorithm.DistinctSentenceGenerated -= AlgorithmDistinctSentenceGenerated;
+      algorithm.Stopped -= AlgorithmOnStopped;
     }
 
     public void Register(GrammarEnumerationAlgorithm algorithm) {
       algorithm.DistinctSentenceGenerated += AlgorithmDistinctSentenceGenerated;
+      algorithm.Stopped += AlgorithmOnStopped;
+    }
+
+    private void AlgorithmOnStopped(object sender, EventArgs eventArgs) {
+      var algorithm = (GrammarEnumerationAlgorithm)sender;
+
+      IResult paretoFrontResult;
+      if (algorithm.Results.TryGetValue(ParetoFrontAnalysisResultName, out paretoFrontResult)) {
+        var plot = (ScatterPlot)paretoFrontResult.Value;
+
+        var solutions = plot.Rows.First().Points.Select(p => (ISymbolicRegressionSolution)p.Tag);
+
+        algorithm.Results.AddOrUpdateResult(ParetoFrontSolutionsResultName, new ItemList<ISymbolicRegressionSolution>(solutions));
+      }
     }
 
@@ -145 +161 @@
       ItemList<DoubleArray> paretoFront = (ItemList<DoubleArray>)algorithm.Results[ParetoFrontResultName].Value;
 
-      DoubleArray precedingRank = paretoFront.OrderByDescending(v => v[0]).FirstOrDefault(v => v[0] <= currRank);
-
-      return precedingRank == null || currQuality > precedingRank[1];
+      int preceedingRankIndex = -1;
+      int lastIndex = paretoFront.Count - 1;
+      while (preceedingRankIndex < lastIndex) {
+        if (preceedingRankIndex + 1 > currRank)
+          break;
+        preceedingRankIndex++;
+      }
+
+      return preceedingRankIndex < 0 || paretoFront[preceedingRankIndex][1] < currQuality;
     }
 
@@ -166 +188 @@
       ScatterPlotDataRow plot = ((ScatterPlot)algorithm.Results[ParetoFrontAnalysisResultName].Value).Rows.First();
 
-
       // Delete solutions with higher rank, which are now dominated.
-      foreach (DoubleArray succeedingRank in paretoFront.Where(k => k[0] >= currRank).ToArray()) {
-        if (succeedingRank[1] < currQuality) {
-          paretoFront.Remove(succeedingRank);
-          RemovePoint(plot, succeedingRank[0]);
+      int i = 0;
+      while (i < paretoFront.Count) {
+        if (paretoFront[i][0] >= currRank) { // Go to current rank
+          double quality = paretoFront[i][1];
+          if (quality <= currQuality) { // If existing solution is worse, delete it
+            RemovePoint(plot, currRank);
+            paretoFront.RemoveAt(i);
+          } else { // Otherwise stop, since following solutions can only be better
+            break;
+          }
+        } else {
+          i++;
         }
       }
 
-      paretoFront.Add(new DoubleArray(new double[] { currRank, currQuality }));
+      paretoFront.Insert(i, new DoubleArray(new double[] { currRank, currQuality }));
       plot.Points.Add(new Point2D<double>(currRank, currQuality, solution));
     }