Changeset 9423 for branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionTreeMatching.cs

Timestamp:

05/02/13 13:48:38 (11 years ago)

Author:

bburlacu

Message:

#1772: Implemented GeneticItem-based similarity measure. Renamed ISymbolicExpressionTreeNodeComparer to ISymbolicExpressionTreeNodeSimilarityComparer.

Location:

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Problems.DataAnalysis.Symbolic

Files:

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

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

@@ -12 +12 @@
   [Item("SymbolicExpressionTreeNodeSimilarityComparer", "A comparison operator that checks node equality based on different similarity measures.")]
   [StorableClass]
-  public class SymbolicExpressionTreeNodeSimilarityComparer : Item, ISymbolicExpressionTreeNodeComparer {
+  public class SymbolicExpressionTreeNodeSimilarityComparer : Item, ISymbolicExpressionTreeNodeSimilarityComparer {
     [StorableConstructor]
     private SymbolicExpressionTreeNodeSimilarityComparer(bool deserializing) : base(deserializing) { }
@@ -98 +98 @@
   // - A function node is "greater" than a terminal node
   // - A variable terminal is "greater" than a constant terminal
-  public class SymbolicExpressionTreeNodeComparer : IComparer<ISymbolicExpressionTreeNode> {
+  public class SymbolicExpressionTreeNodeComparer : ISymbolicExpressionTreeNodeComparer {
     public int Compare(ISymbolicExpressionTreeNode a, ISymbolicExpressionTreeNode b) {
       if (!(a is SymbolicExpressionTreeTerminalNode)) {
@@ -208 +208 @@
   private double[,] matrix;
 
-  public SymbolicExpressionTreeNodeSimilarityComparer comparer;
+  public SymbolicExpressionTreeNodeSimilarityComparer SimilarityComparer { get; set; }
 
   public List<ISymbolicExpressionTreeNode> Calculate(ISymbolicExpressionTreeNode n1, ISymbolicExpressionTreeNode n2) {
-    if (comparer == null) throw new Exception("Comparer cannot be null.");
+    if (SimilarityComparer == null) throw new Exception("Comparer cannot be null.");
 
     x = n1.IterateNodesPrefix().ToArray();
@@ -228 +228 @@
         if (i == 0 || j == 0) {
           matrix[i, j] = 0;
-        } else if (comparer.Equals(x[i - 1], y[j - 1])) {
+        } else if (SimilarityComparer.Equals(x[i - 1], y[j - 1])) {
           matrix[i, j] = matrix[i - 1, j - 1] + 1;
         } else {
@@ -241 +241 @@
   private void recon(int i, int j) {
     if (i == 0 || j == 0) return;
-    if (comparer.Equals(x[i - 1], y[j - 1])) {
+    if (SimilarityComparer.Equals(x[i - 1], y[j - 1])) {
       recon(i - 1, j - 1);
       maxCommonSubseq.Add(x[i - 1]);