Changeset 7817 for branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking.Views/3.4

Timestamp:

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

Author:

bburlacu

Message:

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

Location:

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking.Views/3.4

Files:

• GenealogyGraphChart.cs (modified) (3 diffs)
• GenealogyGraphView.cs (modified) (3 diffs)

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
     }