Changeset 12075 for branches/SymbolicExpressionTreeDiversityAnalyzers/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4

Timestamp:

02/25/15 17:53:25 (10 years ago)

Author:

bburlacu

Message:

#2326: Adapted code in the diversity analyzers according to the new base class. Improved wiring of similarity calculators and analyzers.

Location:

branches/SymbolicExpressionTreeDiversityAnalyzers/HeuristicLab.Problems.DataAnalysis.Symbolic

Files:

• . (modified) (1 prop)
• 3.4/Analyzers/SymbolicDataAnalysisBottomUpDiversityAnalyzer.cs (modified) (3 diffs)
• 3.4/SymbolicDataAnalysisProblem.cs (modified) (5 diffs)

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

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
 using HeuristicLab.Analysis;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -28 +30 @@
   [Item("SymbolicDataAnalysisBottomUpDiversityAnalyzer", "A diversity analyzer based on the bottom-up distance between trees.")]
   [StorableClass]
-  public class SymbolicDataAnalysisBottomUpDiversityAnalyzer : SingleObjectivePopulationDiversityAnalyzer {
+  public class SymbolicDataAnalysisBottomUpDiversityAnalyzer : PopulationSimilarityAnalyzer {
     [StorableConstructor]
     protected SymbolicDataAnalysisBottomUpDiversityAnalyzer(bool deserializing) : base(deserializing) { }
@@ -40 +42 @@
     }
 
-    public SymbolicDataAnalysisBottomUpDiversityAnalyzer() {
-      SimilarityCalculator = new SymbolicExpressionTreeBottomUpSimilarityCalculator { SolutionVariableName = "SymbolicExpressionTree" };
+    public SymbolicDataAnalysisBottomUpDiversityAnalyzer(
+      IEnumerable<ISingleObjectiveSolutionSimilarityCalculator> validSimilarityCalculators)
+      : base(validSimilarityCalculators) {
+      UpdateCounterParameter.ActualName = "GenotypicDiversityAnalyzerUpdateCounter";
     }
   }

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

@@ -118 +118 @@
       set { ProblemDataParameter.Value = value; }
     }
+
     public ISymbolicDataAnalysisGrammar SymbolicExpressionTreeGrammar {
       get { return SymbolicExpressionTreeGrammarParameter.Value; }
@@ -126 +127 @@
       set { SymbolicExpressionTreeInterpreterParameter.Value = value; }
     }
+
     public IntValue MaximumSymbolicExpressionTreeDepth {
       get { return MaximumSymbolicExpressionTreeDepthParameter.Value; }
@@ -141 +143 @@
       get { return RelativeNumberOfEvaluatedSamplesParameter.Value; }
     }
+
     public IntRange FitnessCalculationPartition {
       get { return FitnessCalculationPartitionParameter.Value; }
@@ -228 +231 @@
       Operators.Add(new MinAverageMaxSymbolicExpressionTreeLengthAnalyzer());
       Operators.Add(new SymbolicExpressionTreeLengthAnalyzer());
-      Operators.Add(new SymbolicDataAnalysisBottomUpDiversityAnalyzer());
       Operators.Add(new SymbolicExpressionTreeBottomUpSimilarityCalculator());
+      Operators.Add(new SymbolicDataAnalysisBottomUpDiversityAnalyzer(Operators.OfType<SymbolicExpressionTreeBottomUpSimilarityCalculator>()) { DiversityResultName = "Genotypic Diversity" });
       ParameterizeOperators();
     }
@@ -349 +352 @@
         op.EvaluatorParameter.ActualName = EvaluatorParameter.Name;
       }
-      foreach (var op in operators.OfType<SymbolicExpressionTreeBottomUpSimilarityCalculator>()) {
-        op.SolutionVariableName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
-      }
-      foreach (var op in operators.OfType<SymbolicDataAnalysisBottomUpDiversityAnalyzer>()) {
-        var sim = Operators.OfType<SymbolicExpressionTreeBottomUpSimilarityCalculator>().FirstOrDefault();
-        if (sim != null)
-          op.SimilarityCalculator = sim;
-      }
     }