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

Timestamp:

11/21/10 19:58:45 (13 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)

File:

• branches/DataAnalysis.PopulationDiversityAnalysis/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/SymbolicRegressionProblemBase.cs (modified) (2 diffs)

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";
         }
       }