Changeset 11272

Timestamp:

08/05/14 20:59:25 (10 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:

• Analyzers/SymbolicDataAnalysisBottomUpDiversityAnalyzer.cs (modified) (1 diff)
• Analyzers/SymbolicDataAnalysisPhenotypicDiversityAnalyzer.cs (modified) (1 diff)
• SymbolicDataAnalysisProblem.cs (modified) (4 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisBottomUpDiversityAnalyzer.cs

@@ -11 +11 @@
 
     public SymbolicDataAnalysisBottomUpDiversityAnalyzer() {
-      SimilarityCalculator = new BottomUpSimilarityCalculator();
+      SimilarityCalculator = new BottomUpSimilarityCalculator { SolutionVariableName = "SymbolicExpressionTree" };
     }
   }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisPhenotypicDiversityAnalyzer.cs

@@ -37 +37 @@
 
     public SymbolicDataAnalysisPhenotypicDiversityAnalyzer() {
-      SimilarityCalculator = new PhenotypicSimilarityCalculator();
+      SimilarityCalculator = new PhenotypicSimilarityCalculator { SolutionVariableName = "SymbolicExpressionTree" };
 
       Parameters.Add(new ScopeTreeLookupParameter<ISymbolicExpressionTree>(SymbolicExpressionTreeParameterName, "The symbolic expression trees."));

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs

@@ -23 +23 @@
 using System.Drawing;
 using System.Linq;
-using HeuristicLab.Analysis;
 using HeuristicLab.Common;
 using HeuristicLab.Common.Resources;
@@ -34 +33 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.PluginInfrastructure;
+using HeuristicLab.Problems.DataAnalysis.Symbolic.Analyzers;
 using HeuristicLab.Problems.Instances;
 
@@ -233 +233 @@
       Operators.Add(new MinAverageMaxSymbolicExpressionTreeLengthAnalyzer());
       Operators.Add(new SymbolicExpressionTreeLengthAnalyzer());
-      Operators.Add(new SingleObjectivePopulationDiversityAnalyzer());
-      Operators.Add(new BottomUpSimilarityCalculator());
+      Operators.Add(new SymbolicDataAnalysisPhenotypicDiversityAnalyzer());
+      Operators.Add(new SymbolicDataAnalysisBottomUpDiversityAnalyzer());
       Operators.Add(new SymbolicDataAnalysisGenealogyAnalyzer());
       ParameterizeOperators();
@@ -358 +358 @@
         op.QualityVariableName = "Quality";
         op.SolutionVariableName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
-      }
-      foreach (var op in operators.OfType<SingleObjectivePopulationDiversityAnalyzer>()) {
-        op.SimilarityCalculator = operators.OfType<BottomUpSimilarityCalculator>().SingleOrDefault();
       }
       // add tracking analyzer