Changeset 10347 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionTreeMatching.cs

Timestamp:

01/16/14 16:37:56 (10 years ago)

Author:

bburlacu

Message:

#1772: Small changes to the GenealogyGraph. Added generic Fragment class and interface. Added the SymbolicDataAnalysisPopulationDiversityAnalyzer. Added specialized tracking operators for symbolic data analysis. Merged trunk changes.

Location:

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

Files:

• . (modified) (1 prop)
• 3.4/SymbolicDataAnalysisExpressionTreeMatching.cs (modified) (3 diffs)

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

@@ -5 +5 @@
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
+using HeuristicLab.EvolutionTracking;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.DataAnalysis.Symbolic;
@@ -79 +80 @@
   }
 
-  public class SymbolicExpressionTreeFragmentSimilarityComparer : IEqualityComparer<IFragment> {
+  public class SymbolicExpressionTreeFragmentSimilarityComparer : IEqualityComparer<IFragment<ISymbolicExpressionTreeNode>> {
     public SymbolicExpressionTreeNodeSimilarityComparer SimilarityComparer { get; set; }
 
-    public bool Equals(IFragment x, IFragment y) {
+    public bool Equals(IFragment<ISymbolicExpressionTreeNode> x, IFragment<ISymbolicExpressionTreeNode> y) {
       if (SimilarityComparer == null)
         throw new ArgumentNullException("SimilarityComparer needs to be initialized first.");
-      return x.Length == y.Length && SymbolicExpressionTreeMatching.Match(x.Root, y.Root, SimilarityComparer) == x.Length;
-    }
-
-    public int GetHashCode(IFragment fragment) {
+      return x.Root.GetLength() == y.Root.GetLength() && SymbolicExpressionTreeMatching.Match(x.Root, y.Root, SimilarityComparer) == x.Root.GetLength();
+    }
+
+    public int GetHashCode(IFragment<ISymbolicExpressionTreeNode> fragment) {
       return fragment.Root.Symbol.Name.ToLower().GetHashCode();
     }
@@ -162 +163 @@
 
 public static class SymbolicExpressionTreeMatching {
-  public static bool ContainsFragment(this ISymbolicExpressionTreeNode root, IFragment fragment, SymbolicExpressionTreeNodeSimilarityComparer comparer) {
+  public static bool ContainsFragment(this ISymbolicExpressionTreeNode root, IFragment<ISymbolicExpressionTreeNode> fragment, SymbolicExpressionTreeNodeSimilarityComparer comparer) {
     return FindMatches(root, fragment.Root, comparer).Any();
   }