Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
02/17/15 20:25:46 (9 years ago)
Author:
bburlacu
Message:

#2326: Implemented analyzers

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/SymbolicExpressionTreeDiversityAnalyzers/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs

    r12028 r12029  
    2323using System.Drawing;
    2424using System.Linq;
    25 using HeuristicLab.Analysis;
    2625using HeuristicLab.Common;
    2726using HeuristicLab.Common.Resources;
     
    3029using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    3130using HeuristicLab.Optimization;
    32 using HeuristicLab.Optimization.Operators;
    3331using HeuristicLab.Parameters;
    3432using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3533using HeuristicLab.PluginInfrastructure;
     34using HeuristicLab.Problems.DataAnalysis.Symbolic.Analyzers;
    3635using HeuristicLab.Problems.Instances;
    3736
     
    233232      Operators.Add(new MinAverageMaxSymbolicExpressionTreeLengthAnalyzer());
    234233      Operators.Add(new SymbolicExpressionTreeLengthAnalyzer());
    235       Operators.Add(new SingleObjectivePopulationDiversityAnalyzer());
     234      Operators.Add(new SymbolicDataAnalysisBottomUpDiversityAnalyzer());
     235      Operators.Add(new SymbolicDataAnalysisPhenotypicDiversityAnalyzer());
    236236      ParameterizeOperators();
    237237    }
     
    353353        op.EvaluatorParameter.ActualName = EvaluatorParameter.Name;
    354354      }
    355       foreach (var op in operators.OfType<SingleObjectiveSolutionSimilarityCalculator>()) {
    356         op.QualityVariableName = "Quality";
    357         op.SolutionVariableName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
    358       }
    359       foreach (var op in operators.OfType<SingleObjectivePopulationDiversityAnalyzer>()) {
    360         op.SimilarityCalculator = new SymbolicExpressionTreeBottomUpSimilarityCalculator();
     355      foreach (var op in operators.OfType<SymbolicDataAnalysisBottomUpDiversityAnalyzer>()) {
     356        var similarityCalculator = new SymbolicExpressionTreeBottomUpSimilarityCalculator();
     357        similarityCalculator.QualityVariableName = "Quality";
     358        similarityCalculator.SolutionVariableName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
     359        op.SimilarityCalculator = similarityCalculator;
     360      }
     361      foreach (var op in operators.OfType<SymbolicDataAnalysisPhenotypicDiversityAnalyzer>()) {
     362        var similarityCalculator = new SymbolicExpressionTreePhenotypicSimilarityCalculator();
     363        similarityCalculator.QualityVariableName = "Quality";
     364        similarityCalculator.SolutionVariableName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
     365        op.SimilarityCalculator = similarityCalculator;
    361366      }
    362367    }
Note: See TracChangeset for help on using the changeset viewer.