Changeset 11272


Ignore:
Timestamp:
08/05/14 20:59:25 (5 years ago)
Author:
bburlacu
Message:

#1772: Adjusted SolutionVariableName for symbolic data analysis similarity calculators.

Location:
branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisBottomUpDiversityAnalyzer.cs

    r11271 r11272  
    1111
    1212    public SymbolicDataAnalysisBottomUpDiversityAnalyzer() {
    13       SimilarityCalculator = new BottomUpSimilarityCalculator();
     13      SimilarityCalculator = new BottomUpSimilarityCalculator { SolutionVariableName = "SymbolicExpressionTree" };
    1414    }
    1515  }
  • branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisPhenotypicDiversityAnalyzer.cs

    r11271 r11272  
    3737
    3838    public SymbolicDataAnalysisPhenotypicDiversityAnalyzer() {
    39       SimilarityCalculator = new PhenotypicSimilarityCalculator();
     39      SimilarityCalculator = new PhenotypicSimilarityCalculator { SolutionVariableName = "SymbolicExpressionTree" };
    4040
    4141      Parameters.Add(new ScopeTreeLookupParameter<ISymbolicExpressionTree>(SymbolicExpressionTreeParameterName, "The symbolic expression trees."));
  • branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs

    r11233 r11272  
    2323using System.Drawing;
    2424using System.Linq;
    25 using HeuristicLab.Analysis;
    2625using HeuristicLab.Common;
    2726using HeuristicLab.Common.Resources;
     
    3433using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3534using HeuristicLab.PluginInfrastructure;
     35using HeuristicLab.Problems.DataAnalysis.Symbolic.Analyzers;
    3636using HeuristicLab.Problems.Instances;
    3737
     
    233233      Operators.Add(new MinAverageMaxSymbolicExpressionTreeLengthAnalyzer());
    234234      Operators.Add(new SymbolicExpressionTreeLengthAnalyzer());
    235       Operators.Add(new SingleObjectivePopulationDiversityAnalyzer());
    236       Operators.Add(new BottomUpSimilarityCalculator());
     235      Operators.Add(new SymbolicDataAnalysisPhenotypicDiversityAnalyzer());
     236      Operators.Add(new SymbolicDataAnalysisBottomUpDiversityAnalyzer());
    237237      Operators.Add(new SymbolicDataAnalysisGenealogyAnalyzer());
    238238      ParameterizeOperators();
     
    358358        op.QualityVariableName = "Quality";
    359359        op.SolutionVariableName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
    360       }
    361       foreach (var op in operators.OfType<SingleObjectivePopulationDiversityAnalyzer>()) {
    362         op.SimilarityCalculator = operators.OfType<BottomUpSimilarityCalculator>().SingleOrDefault();
    363360      }
    364361      // add tracking analyzer
Note: See TracChangeset for help on using the changeset viewer.