Changeset 7817

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

Files:

• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Crossovers/TracingSymbolicExpressionTreeCrossover.cs (modified) (1 diff)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Plugin.cs (modified) (1 diff)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeMatching.cs (modified) (2 diffs)
• HeuristicLab.EvolutionaryTracking.Views/3.4/GenealogyGraphChart.cs (modified) (3 diffs)
• HeuristicLab.EvolutionaryTracking.Views/3.4/GenealogyGraphView.cs (modified) (3 diffs)
• HeuristicLab.EvolutionaryTracking/3.4/SymbolicExpressionTreeGenealogyGraph.cs (modified) (1 diff)
• HeuristicLab.Selection/3.3/Plugin.cs (modified) (1 diff)
• HeuristicLab.Tracking.sln.docstates.suo (modified) (previous)
• HeuristicLab.Tracking.suo (modified) (previous)

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);
     }

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking.Views/3.4/GenealogyGraphChart.cs

@@ -160 +160 @@
           // color selected node and its genealogy
           if (_selectedGenealogyGraphNode == null) return;
-          var gNode = _selectedGenealogyGraphNode.Data; // genealogy graph node (representing an individual in the population) 
-          double rank = gNode.Rank;
-          var ancestors = gNode.Ancestors().Where(a => a.Rank < rank).ToList();
-          ancestors.Add(gNode);
           // use special highlighting for the currently selected genealogy graph node
           var center = _selectedGenealogyGraphNode.Center;
@@ -174 +170 @@
             Chart.Group.Add(_targetRectangle);
           }
+          var gNode = _selectedGenealogyGraphNode.Data; // genealogy graph node (representing an individual in the population) 
+          double rank = gNode.Rank;
+          var ancestors = gNode.Ancestors().Where(a => a.Rank < rank).ToList();
+          ancestors.Add(gNode);
           // highlight selected node and its ancestry
           foreach (var node in ancestors.SelectMany(n => _visualNodeMap[n])) {
@@ -206 +206 @@
         if (_selectedGenealogyGraphNode != null)
           /* emit clicked event */
-          OnGenealogyGraphNodeClicked(_selectedGenealogyGraphNode, e);
+          GenealogyGraphNodeClicked(_selectedGenealogyGraphNode, e);
       }
     }

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking.Views/3.4/GenealogyGraphView.cs

@@ -97 +97 @@
         int index = SymbolicExpressionTreeMatching.FindMatch(nodes, fragments, similarityModeSelector.SelectedIndex);
         if (index != -1) {
-          _selectedVisualSymbolicExpressionTreeNode = symbolicExpressionTreeChart.GetVisualSymbolicExpressionTreeNode(nodes[index + fragments.Count - 1]);
+          _selectedVisualSymbolicExpressionTreeNode = symbolicExpressionTreeChart.GetVisualSymbolicExpressionTreeNode(nodes[index]);
           var subtree = _selectedVisualSymbolicExpressionTreeNode.SymbolicExpressionTreeNode;
           foreach (var visualNode in subtree.IterateNodesBreadth().Select(node => symbolicExpressionTreeChart.GetVisualSymbolicExpressionTreeNode(node))) {
@@ -111 +111 @@
         if (arc != null) {
           var fragment = arc.Data as ISymbolicExpressionTreeNode;
-          //var fragmentNodes = fragment.IterateNodesBreadth() as List<ISymbolicExpressionTreeNode>;
-          //var treeNodes = tree.IterateNodesBreadth() as List<ISymbolicExpressionTreeNode>;
-          //var idx = SymbolicExpressionTreeMatching.FindMatch(treeNodes, fragmentNodes, (int)SymbolicExpressionTreeMatching.SimilarityLevel.Exact);
           foreach (var node in fragment.IterateNodesBreadth()) {
             var visualNode = symbolicExpressionTreeChart.GetVisualSymbolicExpressionTreeNode(node);
@@ -121 +118 @@
         }
       }
-      // what's left to be done here is to:
-      // - get the symbolic expression tree 
-      // - get the corresponding fragment
-      // - for all symbolic expression tree nodes in the fragment, colorize the corresponding visual nodes
-      // - repaint the tree
     }
 

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking/3.4/SymbolicExpressionTreeGenealogyGraph.cs

@@ -16 +16 @@
     #region Fragment tracing
     public IEnumerable<ISymbolicExpressionTree> TraceFragment(ISymbolicExpressionTreeNode fragment, int mode = 0) {
-      //return Keys.Where(tree => ContainsFragment(tree, fragment, mode) != -1);
       return Keys.Where(tree => tree.ContainsFragment(fragment, mode));
     }

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Selection/3.3/Plugin.cs

@@ -26 +26 @@
   /// Plugin class for HeuristicLab.Selection plugin.
   /// </summary>
-  [Plugin("HeuristicLab.Selection", "3.3.6.7799")]
+  [Plugin("HeuristicLab.Selection", "3.3.6.7800")]
   [PluginFile("HeuristicLab.Selection-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Collections", "3.3")]