Changeset 18053

Timestamp:

09/14/21 09:37:29 (3 years ago)

Author:

gkronber

Message:

#3135 added a new analyzer which allows to configure the solution result name, and renamed and marked the existing SolutionRSquaredAnalyzer as obsolete.

Location:

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj (modified) (1 diff)
• SingleObjective/SolutionQualityAnalyzer.cs (added)
• SingleObjective/SolutionRSquaredAnalyzer.cs (moved) (moved from trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSolutionsAnalyzer.cs) (4 diffs)
• SingleObjective/SymbolicRegressionSingleObjectiveProblem.cs (modified) (2 diffs)

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj

@@ -133 +133 @@
     <Compile Include="SingleObjective\Evaluators\SymbolicRegressionMeanRelativeErrorEvaluator.cs" />
     <Compile Include="SingleObjective\ShapeConstrainedRegressionSingleObjectiveProblem.cs" />
-    <Compile Include="SingleObjective\SymbolicRegressionSolutionsAnalyzer.cs" />
+    <Compile Include="SingleObjective\SolutionQualityAnalyzer.cs" />
+    <Compile Include="SingleObjective\SolutionRSquaredAnalyzer.cs" />
     <Compile Include="SymbolicRegressionPhenotypicDiversityAnalyzer.cs" />
     <Compile Include="SymbolicRegressionPruningAnalyzer.cs" />

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SolutionRSquaredAnalyzer.cs

@@ -31 +31 @@
 using HeuristicLab.Parameters;
 using HEAL.Attic;
+using System;
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression {
   [StorableType("789E0217-6DDC-44E8-85CC-A51A976A8FB8")]
-  public class SymbolicRegressionSolutionsAnalyzer : SingleSuccessorOperator, IAnalyzer {
+  [Obsolete("Use SolutionQualityAnalyzer instead")]
+  public class SolutionRSquaredAnalyzer : SingleSuccessorOperator, IAnalyzer {
     private const string ResultCollectionParameterName = "Results";
     private const string RegressionSolutionQualitiesResultName = "Regression Solution Qualities";
@@ -55 +57 @@
 
     [StorableConstructor]
-    protected SymbolicRegressionSolutionsAnalyzer(StorableConstructorFlag _) : base(_) { }
-    protected SymbolicRegressionSolutionsAnalyzer(SymbolicRegressionSolutionsAnalyzer original, Cloner cloner)
+    protected SolutionRSquaredAnalyzer(StorableConstructorFlag _) : base(_) { }
+    protected SolutionRSquaredAnalyzer(SolutionRSquaredAnalyzer original, Cloner cloner)
       : base(original, cloner) { }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new SymbolicRegressionSolutionsAnalyzer(this, cloner);
+      return new SolutionRSquaredAnalyzer(this, cloner);
     }
 
-    public SymbolicRegressionSolutionsAnalyzer() {
+    public SolutionRSquaredAnalyzer() {
       Parameters.Add(new LookupParameter<ResultCollection>(ResultCollectionParameterName, "The result collection to store the analysis results."));
       Parameters.Add(new LookupParameter<DoubleValue>(TrainingQualityParameterName));
@@ -93 +95 @@
       ILookupParameter<DoubleValue> trainingQualityParam = null;
       ILookupParameter<DoubleValue> testQualityParam = null;
-      // store actual names of parameter because it is changed below
+      // store actual names of parameter because they are changed below
       trainingQualityParam = TrainingQualityParameter;
       string prevTrainingQualityParamName = trainingQualityParam.ActualName;
@@ -113 +115 @@
 
         // also add training and test R² to the scope using the parameters
-        // HACK: we change the ActualName of the parameter to write two variables for each solution in the results collection
+        // HACK: we change the ActualName of the parameter to write training & test quality for each solution in the results collection
         trainingQualityParam.ActualName = trainingR2Name;
         trainingQualityParam.ActualValue = new DoubleValue(solution.TrainingRSquared);

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSingleObjectiveProblem.cs

@@ -90 +90 @@
         changed = true;
       }
-      if (!Operators.OfType<SymbolicRegressionSolutionsAnalyzer>().Any()) {
-        Operators.Add(new SymbolicRegressionSolutionsAnalyzer());
+      if (!Operators.OfType<SolutionQualityAnalyzer>().Any()) {
+        Operators.Add(new SolutionQualityAnalyzer());
         changed = true;
       }
@@ -119 +119 @@
       Operators.Add(new SymbolicRegressionSingleObjectiveTrainingParetoBestSolutionAnalyzer());
       Operators.Add(new SymbolicRegressionSingleObjectiveValidationParetoBestSolutionAnalyzer());
-      Operators.Add(new SymbolicRegressionSolutionsAnalyzer());
+      Operators.Add(new SolutionQualityAnalyzer());
       Operators.Add(new SymbolicExpressionTreePhenotypicSimilarityCalculator());
       Operators.Add(new ShapeConstraintsAnalyzer());