Changeset 11197 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers

Timestamp:

07/16/14 16:32:48 (11 years ago)

Author:

bburlacu

Message:

#1772: Separated tree distance calculations in different classes which implement a new interface called IDistanceCalculator. The isomorphic tree distance calculates the distance based on the maximum common subtree between two symbolic expression trees, and the bottom-up tree distance returns a value based on the number of matching pairs of nodes in a bottom-up mapping. Introduced the distance calculator as a parameter in the SimilarityCalculator operator so that the diversity analyzer can use either of the two distances.

File:

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

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

@@ -49 +49 @@
     private const string StoreHistoryParameterName = "StoreHistory";
     // comparer parameters
-    private const string MatchVariablesParameterName = "MatchVariableNames";
-    private const string MatchVariableWeightsParameterName = "MatchVariableWeights";
-    private const string MatchConstantValuesParameterName = "MatchConstantValues";
     private const string SimilarityValuesParmeterName = "Similarity";
+
+    private const string DistanceCalculatorParameterName = "DistanceCalculator";
 
     #endregion
@@ -78 +77 @@
       get { return (IScopeTreeLookupParameter<ISymbolicExpressionTree>)Parameters[SymbolicExpressionTreeParameterName]; }
     }
-    public ValueParameter<BoolValue> MatchVariableNamesParameter {
-      get { return (ValueParameter<BoolValue>)Parameters[MatchVariablesParameterName]; }
-    }
-    public ValueParameter<BoolValue> MatchVariableWeightsParameter {
-      get { return (ValueParameter<BoolValue>)Parameters[MatchVariableWeightsParameterName]; }
-    }
-    public ValueParameter<BoolValue> MatchConstantValuesParameter {
-      get { return (ValueParameter<BoolValue>)Parameters[MatchConstantValuesParameterName]; }
-    }
     public ILookupParameter<DoubleValue> SimilarityParameter {
       get { return (ILookupParameter<DoubleValue>)Parameters[SimilarityValuesParmeterName]; }
+    }
+    public IValueParameter<IDistanceCalculator> DistanceCalculatorParameter {
+      get { return (IValueParameter<IDistanceCalculator>)Parameters[DistanceCalculatorParameterName]; }
     }
     #endregion
@@ -122 +115 @@
       Parameters.Add(new ValueLookupParameter<ResultCollection>(ResultsParameterName, "The results collection where the analysis values should be stored."));
       Parameters.Add(new LookupParameter<IntValue>(GenerationsParameterName, "The number of generations so far."));
-      Parameters.Add(new ValueParameter<BoolValue>(MatchVariablesParameterName, "Specify if the symbolic expression tree comparer should match variable names.", new BoolValue(true)));
-      Parameters.Add(new ValueParameter<BoolValue>(MatchVariableWeightsParameterName, "Specify if the symbolic expression tree comparer should match variable weights.", new BoolValue(true)));
-      Parameters.Add(new ValueParameter<BoolValue>(MatchConstantValuesParameterName, "Specify if the symbolic expression tree comparer should match constant values.", new BoolValue(true)));
       Parameters.Add(new ValueParameter<BoolValue>(StoreHistoryParameterName, "True if the tree lengths history of the population should be stored.", new BoolValue(false)));
       Parameters.Add(new LookupParameter<DoubleValue>(SimilarityValuesParmeterName, ""));
       Parameters.Add(new ValueLookupParameter<IntValue>(MaximumSymbolicExpressionTreeDepthParameterName, "The maximal depth of the symbolic expression tree (a tree with one node has depth = 0)."));
+      Parameters.Add(new ValueParameter<IDistanceCalculator>(DistanceCalculatorParameterName, "The distance calculator between trees.", new BottomUpDistanceCalculator()));
       UpdateCounterParameter.Hidden = true;
       UpdateIntervalParameter.Hidden = true;
@@ -159 +150 @@
         SimilarityParameter.ActualValue = new DoubleValue();
 
-        var comparer = new SymbolicExpressionTreeNodeSimilarityComparer {
-          MatchConstantValues = MatchConstantValuesParameter.Value.Value,
-          MatchVariableNames = MatchVariableNamesParameter.Value.Value,
-          MatchVariableWeights = MatchVariableWeightsParameter.Value.Value
-        };
-
         var operations = new OperationCollection { Parallel = true };
         foreach (var tree in trees) {
-          var op = new SymbolicDataAnalysisExpressionTreeSimilarityCalculator {
+          var op = new SymbolicDataAnalysisExpressionTreeSimilarityCalculator(DistanceCalculatorParameter.Value) {
             CurrentSymbolicExpressionTree = tree,
-            SimilarityComparer = comparer,
             MaximumTreeDepth = MaximumSymbolicExpressionTreeDepth.Value
           };