Changeset 7817 for branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding

Timestamp:

05/15/12 00:21:10 (13 years ago)

Author:

bburlacu

Message:

#1772: Fixed a small bug in the TracingSymbolicExpressionTreeCrossover. Fixed bug in fragment matching code.

Location:

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4

Files:

• Crossovers/TracingSymbolicExpressionTreeCrossover.cs (modified) (1 diff)
• Plugin.cs (modified) (1 diff)
• SymbolicExpressionTreeMatching.cs (modified) (2 diffs)

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Crossovers/TracingSymbolicExpressionTreeCrossover.cs

@@ -127 +127 @@
       // compare the two nodes lists and check the difference (comparing node references so we avoid false functional identity). 
       // if no difference is found, then it is assumed that the whole tree was swapped with itself (it can happen), so the index is 0
-      int i, min = Math.Max(nodes0.Count, nodes1.Count);
-      for (i = 0; i != min; ++i)
+      int i = 0, min = Math.Min(nodes0.Count, nodes1.Count);
+      for (; i != min; ++i)
         if (nodes0[i] != nodes1[i]) break;
       if (i == min) i = 0;

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Plugin.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
-  [Plugin("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding","Provides operators and related classes for the symbolic expression tree encoding.", "3.4.2.7799")]
+  [Plugin("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding","Provides operators and related classes for the symbolic expression tree encoding.", "3.4.2.7800")]
   [PluginFile("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Analysis", "3.3")]

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeMatching.cs

@@ -70 +70 @@
 
     public static bool ContainsFragment(this ISymbolicExpressionTree tree, ISymbolicExpressionTreeNode fragment, int mode) {
-      var nodes = tree.IterateNodesBreadth() as List<ISymbolicExpressionTreeNode>;
-      var fragments = fragment.IterateNodesBreadth() as List<ISymbolicExpressionTreeNode>;
+      var nodes = tree.IterateNodesPostfix() as List<ISymbolicExpressionTreeNode>;
+      var fragments = fragment.IterateNodesPostfix() as List<ISymbolicExpressionTreeNode>;
       return FindMatch(nodes, fragments, mode) != -1;
     }
@@ -77 +77 @@
     // convenience methods for less typing :)
     private static IEnumerator<ISymbolicExpressionTreeNode> Enumerator(this ISymbolicExpressionTree tree) {
-      return tree.IterateNodesBreadth().GetEnumerator();
+      return tree.IterateNodesPostfix().GetEnumerator();
     }
     private static IEnumerator<ISymbolicExpressionTreeNode> Enumerator(this ISymbolicExpressionTreeNode tree) {
-      return tree.IterateNodesBreadth().GetEnumerator();
+      return tree.IterateNodesPostfix().GetEnumerator();
     }
     public static int FindMatch(ISymbolicExpressionTree a, ISymbolicExpressionTree b, int mode) {
-      var nodesA = a.IterateNodesBreadth() as List<ISymbolicExpressionTreeNode>;
-      var nodesB = b.IterateNodesBreadth() as List<ISymbolicExpressionTreeNode>;
+      var nodesA = a.IterateNodesPostfix() as List<ISymbolicExpressionTreeNode>;
+      var nodesB = b.IterateNodesPostfix() as List<ISymbolicExpressionTreeNode>;
       return FindMatch(nodesA, nodesB, mode);
     }
     public static int FindMatch(ISymbolicExpressionTreeNode a, ISymbolicExpressionTreeNode b, int mode) {
-      var nodesA = a.IterateNodesBreadth() as List<ISymbolicExpressionTreeNode>;
-      var nodesB = b.IterateNodesBreadth() as List<ISymbolicExpressionTreeNode>;
+      var nodesA = a.IterateNodesPostfix() as List<ISymbolicExpressionTreeNode>;
+      var nodesB = b.IterateNodesPostfix() as List<ISymbolicExpressionTreeNode>;
       return FindMatch(nodesA, nodesB, mode);
     }