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

Timestamp:

10/21/14 01:31:20 (10 years ago)

Author:

bburlacu

Message:

#1772: Added the ability to ignore variable weights or constant values to the BottomUpSimilarityCalculator and added parameters to the SymbolicDataAnalysisBottomUpDiversityAnalyzer. Added separate methods in the MaxCommonSubtreeSimilarityCalculator for performing matching with full subtrees (including all leaves) or without (like the old - and better - behavior).

File:

• branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisBottomUpDiversityAnalyzer.cs (modified) (2 diffs)

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

@@ -22 +22 @@
 using HeuristicLab.Analysis;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
+using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -28 +30 @@
   [StorableClass]
   public class SymbolicDataAnalysisBottomUpDiversityAnalyzer : SingleObjectivePopulationDiversityAnalyzer {
+    private const string MatchConstantValuesParameterName = "MatchConstantValues";
+    private const string MatchVariableWeightsParameterName = "MatchVariableWeights";
+
+    public IValueParameter<BoolValue> MatchVariableWeightsParameter {
+      get { return (IValueParameter<BoolValue>)Parameters[MatchVariableWeightsParameterName]; }
+    }
+
+    public IValueParameter<BoolValue> MatchConstantValuesParameter {
+      get { return (IValueParameter<BoolValue>)Parameters[MatchConstantValuesParameterName]; }
+    }
+
+    public bool MatchConstantValues {
+      get { return MatchConstantValuesParameter.Value.Value; }
+      set {
+        MatchConstantValuesParameter.Value.Value = value;
+        ((BottomUpSimilarityCalculator)SimilarityCalculator).MatchConstantValues = value;
+      }
+    }
+
+    public bool MatchVariableWeights {
+      get { return MatchVariableWeightsParameter.Value.Value; }
+      set {
+        MatchVariableWeightsParameter.Value.Value = value;
+        ((BottomUpSimilarityCalculator)SimilarityCalculator).MatchVariableWeights = value;
+      }
+    }
+
     [StorableConstructor]
     protected SymbolicDataAnalysisBottomUpDiversityAnalyzer(bool deserializing) : base(deserializing) { }
 
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      if (!Parameters.ContainsKey(MatchConstantValuesParameterName))
+        Parameters.Add(new ValueParameter<BoolValue>(MatchConstantValuesParameterName, "Specifies if the similarity calculator should match constant values.", new BoolValue(true)));
+      if (!Parameters.ContainsKey(MatchVariableWeightsParameterName))
+        Parameters.Add(new ValueParameter<BoolValue>(MatchVariableWeightsParameterName, "Specifies if the similarity calculator should match variable weights", new BoolValue(true)));
+    }
+
     public SymbolicDataAnalysisBottomUpDiversityAnalyzer() {
       SimilarityCalculator = new BottomUpSimilarityCalculator { SolutionVariableName = "SymbolicExpressionTree" };
+      Parameters.Add(new ValueParameter<BoolValue>(MatchConstantValuesParameterName, "Specifies if the similarity calculator should match constant values.", new BoolValue(true)));
+      Parameters.Add(new ValueParameter<BoolValue>(MatchVariableWeightsParameterName, "Specifies if the similarity calculator should match variable weights", new BoolValue(true)));
     }
   }