Free cookie consent management tool by TermsFeed Policy Generator

Changeset 4881


Ignore:
Timestamp:
11/21/10 00:48:12 (13 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:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • branches/DataAnalysis.PopulationDiversityAnalysis/HeuristicLab.Problems.DataAnalysis.Regression/3.3/HeuristicLab.Problems.DataAnalysis.Regression-3.3.csproj

    r4877 r4881  
    182182    <Compile Include="SupportVectorRegression\SupportVectorRegressionSolution.cs" />
    183183    <Compile Include="Symbolic\Analyzers\BestSymbolicRegressionSolutionAnalyzer.cs" />
     184    <Compile Include="Symbolic\Analyzers\VariablesUsagePopulationDiversityAnalyzer.cs" />
    184185    <Compile Include="Symbolic\Analyzers\FixedValidationBestScaledSymbolicRegressionSolutionAnalyzer.cs" />
    185186    <Compile Include="Symbolic\Analyzers\ISymbolicRegressionAnalyzer.cs" />
  • branches/DataAnalysis.PopulationDiversityAnalysis/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/SymbolicRegressionProblemBase.cs

    r4877 r4881  
    146146      get { return DataAnalysisProblemData.TestSamplesEnd; }
    147147    }
     148
     149    private VariablesUsagePopulationDiversityAnalyzer VariablesUsagePopulationDiversityAnalyzer {
     150      get { return operators.OfType<VariablesUsagePopulationDiversityAnalyzer>().FirstOrDefault(); }
     151    }
     152
    148153    #endregion
    149154
     
    297302      operators.Add(new MinAverageMaxSymbolicExpressionTreeSizeAnalyzer());
    298303      operators.Add(new SymbolicRegressionModelQualityAnalyzer());
     304      operators.Add(new VariablesUsagePopulationDiversityAnalyzer());
    299305      ParameterizeOperators();
    300306      ParameterizeAnalyzers();
     
    324330          varFreqAnalyzer.ProblemDataParameter.ActualName = DataAnalysisProblemDataParameter.Name;
    325331        }
     332        var populationDiversityAnalyzer = analyzer as HeuristicLab.Analysis.PopulationDiversityAnalyzer<SymbolicExpressionTree>;
     333        if (populationDiversityAnalyzer != null) {
     334          // ??? VariablesUsagePopulationDiversityAnalysisOperator.MaximizationParameter.ActualName =
     335          VariablesUsagePopulationDiversityAnalyzer.SolutionParameter.ActualName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
     336          // ??? VariablesUsagePopulationDiversityAnalysisOperator.QualityParameter.ActualName
     337          VariablesUsagePopulationDiversityAnalyzer.ResultsParameter.ActualName = "Results";
     338        }
     339        if (VariablesUsagePopulationDiversityAnalyzer != null) {
     340          VariablesUsagePopulationDiversityAnalyzer.ProblemDataParameter.ActualName = DataAnalysisProblemDataParameter.Name;
     341        }
    326342      }
    327343      foreach (ISymbolicExpressionTreeAnalyzer analyzer in Operators.OfType<ISymbolicExpressionTreeAnalyzer>()) {
Note: See TracChangeset for help on using the changeset viewer.