Changeset 4881

Timestamp:

11/21/10 00:48:12 (14 years ago)

Author:

swinkler

Message:

Added first version of variables usage population diversity analyzer. (#1278)

Location:

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

Files:

• HeuristicLab.Problems.DataAnalysis.Regression-3.3.csproj (modified) (1 diff)
• Symbolic/Analyzers/VariablesUsagePopulationDiversityAnalyzer.cs (added)
• Symbolic/SymbolicRegressionProblemBase.cs (modified) (3 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\VariablesUsagePopulationDiversityAnalyzer.cs" />
     <Compile Include="Symbolic\Analyzers\FixedValidationBestScaledSymbolicRegressionSolutionAnalyzer.cs" />
     <Compile Include="Symbolic\Analyzers\ISymbolicRegressionAnalyzer.cs" />

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

@@ -146 +146 @@
       get { return DataAnalysisProblemData.TestSamplesEnd; }
     }
+
+    private VariablesUsagePopulationDiversityAnalyzer VariablesUsagePopulationDiversityAnalyzer {
+      get { return operators.OfType<VariablesUsagePopulationDiversityAnalyzer>().FirstOrDefault(); }
+    }
+
     #endregion
 
@@ -297 +302 @@
       operators.Add(new MinAverageMaxSymbolicExpressionTreeSizeAnalyzer());
       operators.Add(new SymbolicRegressionModelQualityAnalyzer());
+      operators.Add(new VariablesUsagePopulationDiversityAnalyzer());
       ParameterizeOperators();
       ParameterizeAnalyzers();
@@ -324 +330 @@
           varFreqAnalyzer.ProblemDataParameter.ActualName = DataAnalysisProblemDataParameter.Name;
         }
+        var populationDiversityAnalyzer = analyzer as HeuristicLab.Analysis.PopulationDiversityAnalyzer<SymbolicExpressionTree>;
+        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;
+        }
       }
       foreach (ISymbolicExpressionTreeAnalyzer analyzer in Operators.OfType<ISymbolicExpressionTreeAnalyzer>()) {