Changeset 4885

Timestamp:

11/21/10 19:58:45 (14 years ago)

Author:

swinkler

Message:

Added abstract base class for population diversity analyzers for symbolic regression; simplified management of population diversity analyzers in symbolic regression problem base. (#1278)

Location:

branches/DataAnalysis.PopulationDiversityAnalysis/HeuristicLab.Problems.DataAnalysis.Regression/3.3

Files:

• HeuristicLab.Problems.DataAnalysis.Regression-3.3.csproj (modified) (1 diff)
• Symbolic/Analyzers/SymbolicRegressionPopulationDiversityAnalyzer.cs (added)
• Symbolic/Analyzers/VariablesUsagePopulationDiversityAnalyzer.cs (modified) (1 diff)
• Symbolic/SymbolicRegressionProblemBase.cs (modified) (2 diffs)

branches/DataAnalysis.PopulationDiversityAnalysis/HeuristicLab.Problems.DataAnalysis.Regression/3.3/HeuristicLab.Problems.DataAnalysis.Regression-3.3.csproj

@@ -182 +182 @@
     <Compile Include="SupportVectorRegression\SupportVectorRegressionSolution.cs" />
     <Compile Include="Symbolic\Analyzers\BestSymbolicRegressionSolutionAnalyzer.cs" />
+    <Compile Include="Symbolic\Analyzers\SymbolicRegressionPopulationDiversityAnalyzer.cs" />
     <Compile Include="Symbolic\Analyzers\VariablesUsagePopulationDiversityAnalyzer.cs" />
     <Compile Include="Symbolic\Analyzers\FixedValidationBestScaledSymbolicRegressionSolutionAnalyzer.cs" />

branches/DataAnalysis.PopulationDiversityAnalysis/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/Analyzers/VariablesUsagePopulationDiversityAnalyzer.cs

@@ -41 +41 @@
   [Item("VariablesUsagePopulationDiversityAnalysisOperator", "An operator that analyzes the population diversity with respect to the sets of used variables.")]
   [StorableClass]
-  public sealed class VariablesUsagePopulationDiversityAnalyzer : PopulationDiversityAnalyzer<SymbolicExpressionTree>, ISymbolicRegressionAnalyzer {
-
-    private const string ProblemDataParameterName = "ProblemData";
-
-    public IValueLookupParameter<DataAnalysisProblemData> ProblemDataParameter {
-      get { return (IValueLookupParameter<DataAnalysisProblemData>)Parameters[ProblemDataParameterName]; }
-    }
-    public DataAnalysisProblemData ProblemData {
-      get { return ProblemDataParameter.ActualValue; }
-    }
-
-    #region ISymbolicRegressionAnalyzer Members
-
-    public ScopeTreeLookupParameter<SymbolicExpressionTree> SymbolicExpressionTreeParameter {
-      get { return base.SolutionParameter; }
-    }
-
-    public new ILookupParameter<ResultCollection> ResultsParameter {
-      get { return base.ResultsParameter; }
-    }
-
-    #endregion
+  public sealed class VariablesUsagePopulationDiversityAnalyzer : SymbolicRegressionPopulationDiversityAnalyzer {
 
     [StorableConstructor]
     private VariablesUsagePopulationDiversityAnalyzer(bool deserializing) : base(deserializing) { }
     private VariablesUsagePopulationDiversityAnalyzer(VariablesUsagePopulationDiversityAnalyzer original, Cloner cloner) : base(original, cloner) { }
-    public VariablesUsagePopulationDiversityAnalyzer() : base() {
-      Parameters.Add(new ValueLookupParameter<DataAnalysisProblemData>(ProblemDataParameterName, "The problem data for which the symbolic expression tree is a solution."));
-    }
+    public VariablesUsagePopulationDiversityAnalyzer() : base() { }
 
     public override IDeepCloneable Clone(Cloner cloner) {

branches/DataAnalysis.PopulationDiversityAnalysis/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/SymbolicRegressionProblemBase.cs

@@ -147 +147 @@
     }
 
-    private VariablesUsagePopulationDiversityAnalyzer VariablesUsagePopulationDiversityAnalyzer {
-      get { return operators.OfType<VariablesUsagePopulationDiversityAnalyzer>().FirstOrDefault(); }
-    }
-
     #endregion
 
@@ -330 +326 @@
           varFreqAnalyzer.ProblemDataParameter.ActualName = DataAnalysisProblemDataParameter.Name;
         }
-        var populationDiversityAnalyzer = analyzer as HeuristicLab.Analysis.PopulationDiversityAnalyzer<SymbolicExpressionTree>;
+        var populationDiversityAnalyzer = analyzer as SymbolicRegressionPopulationDiversityAnalyzer;
         if (populationDiversityAnalyzer != null) {
-          // ??? VariablesUsagePopulationDiversityAnalysisOperator.MaximizationParameter.ActualName = 
-          VariablesUsagePopulationDiversityAnalyzer.SolutionParameter.ActualName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
-          // ??? VariablesUsagePopulationDiversityAnalysisOperator.QualityParameter.ActualName 
-          VariablesUsagePopulationDiversityAnalyzer.ResultsParameter.ActualName = "Results";
-        }
-        if (VariablesUsagePopulationDiversityAnalyzer != null) {
-          VariablesUsagePopulationDiversityAnalyzer.ProblemDataParameter.ActualName = DataAnalysisProblemDataParameter.Name;
+          populationDiversityAnalyzer.ProblemDataParameter.ActualName = DataAnalysisProblemDataParameter.Name;
+          // ??? populationDiversityAnalyzer.MaximizationParameter.ActualName = 
+          populationDiversityAnalyzer.SolutionParameter.ActualName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
+          // ??? populationDiversityAnalyzer.QualityParameter.ActualName 
+          populationDiversityAnalyzer.ResultsParameter.ActualName = "Results";
         }
       }