Changeset 7800 for branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking/3.4/Analyzers/SymbolicExpressionTreeGenealogyAnalyzer.cs

Timestamp:

05/14/12 02:09:50 (12 years ago)

Author:

bburlacu

Message:

#1772: Fixed display of genetic fragments (received via crossover) in the GenealogyGraphView. Added parent, offspring and fragment lengths histogram.

File:

• branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking/3.4/Analyzers/SymbolicExpressionTreeGenealogyAnalyzer.cs (modified) (3 diffs)

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking/3.4/Analyzers/SymbolicExpressionTreeGenealogyAnalyzer.cs

@@ -263 +263 @@
 
           foreach (var parent in parents) {
-            object data;
+            object data = ((List<ISymbolicExpressionTreeNode>)child.IterateNodesBreadth())[((IntValue)GlobalFragmentMap[child]).Value];
+            graph.AddArc(parent, child, null, data);
             if (GlobalTraceMap.ContainsKey(parent)) {
               double quality = Evaluate(parent);
@@ -271 +272 @@
               foreach (var p in pp) {
                 data = ((List<ISymbolicExpressionTreeNode>)parent.IterateNodesBreadth())[((IntValue)GlobalFragmentMap[parent]).Value];
-                graph.AddArc(p, parent, data);
+                graph.AddArc(p, parent, null, data);
               }
             }
-            data = ((List<ISymbolicExpressionTreeNode>)child.IterateNodesBreadth())[((IntValue)GlobalFragmentMap[child]).Value];
-            graph.AddArc(parent, child, data);
           }
         }
@@ -334 +333 @@
     }
 
-
-
     private double Evaluate(ISymbolicExpressionTree tree) {
       // we perform evaluation by adding a temporary subscope with the tree in it, and calling evaluator.Apply()