Changeset 11458 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SimilarityCalculators/BottomUpSimilarityCalculator.cs

Timestamp:

10/13/14 13:03:24 (10 years ago)

Author:

bburlacu

Message:

#1772: HeuristicLab.Problems.DataAnalysis.Symbolic:

• Merged trunk changes (SymbolicExpressionImporter)
• Added Passthrough symbol (does not perform an operation, just transfers the input), adjusted interpreter and opcodes accordingly
• Added diversity preserving crossover
• Replaced IDistanceCalculator interface with ISymbolicDataAnalysisExpressionSimilarityCalculator and adjusted similarity calculators
• Refactored tracing, moved functionality to the TraceCalculator (when this is complete the old code will be removed)

Location:

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

Files:

• . (modified) (1 prop)
• SimilarityCalculators/BottomUpSimilarityCalculator.cs (modified) (4 diffs)

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

@@ -5 +5 @@
 TreeDistance
 SymbolicDataAnalysisExpressionTreeMatching.cs
+Importer

@@ -5 +5 @@
 TreeDistance
 SymbolicDataAnalysisExpressionTreeMatching.cs
+Importer

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SimilarityCalculators/BottomUpSimilarityCalculator.cs

@@ -32 +32 @@
   [StorableClass]
   [Item("BottomUpSimilarityCalculator", "A similarity calculator which uses the tree bottom-up distance as a similarity metric.")]
-  public class BottomUpSimilarityCalculator : SingleObjectiveSolutionSimilarityCalculator {
+  public class BottomUpSimilarityCalculator : SingleObjectiveSolutionSimilarityCalculator, ISymbolicDataAnalysisExpressionSimilarityCalculator {
     private readonly HashSet<string> commutativeSymbols = new HashSet<string> { "Addition", "Multiplication", "Average", "And", "Or", "Xor" };
 
@@ -39 +39 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       return new BottomUpSimilarityCalculator(this, cloner);
+    }
+
+    public double CalculateSimilarity(ISymbolicExpressionTree t1, ISymbolicExpressionTree t2) {
+      if (t1 == t2)
+        return 1;
+
+      var map = ComputeBottomUpMapping(t1.Root, t2.Root);
+      return 2.0 * map.Count / (t1.Length + t2.Length);
     }
 
@@ -52 +60 @@
         throw new ArgumentException("Cannot calculate similarity when one of the arguments is null.");
 
-      var similarity = CalculateSolutionSimilarity(t1, t2);
+      var similarity = CalculateSimilarity(t1, t2);
       if (similarity > 1.0)
         throw new Exception("Similarity value cannot be greater than 1");
 
       return similarity;
-    }
-
-    public double CalculateSolutionSimilarity(ISymbolicExpressionTree t1, ISymbolicExpressionTree t2) {
-      if (t1 == t2)
-        return 1;
-
-      var map = ComputeBottomUpMapping(t1.Root, t2.Root);
-      return 2.0 * map.Count / (t1.Length + t2.Length);
     }
 
@@ -174 +174 @@
         }
 
+        if (n == n1 || n == n2)
+          continue;
+
         var p = n.Parent;
         if (p == null)

@@ -5 +5 @@
 TreeDistance
 SymbolicDataAnalysisExpressionTreeMatching.cs
+Importer