Changeset 8249

Timestamp:

07/06/12 11:44:58 (12 years ago)

Author:

bburlacu

Message:

#1772: Fixed small bug (correct counting of node ranks) in the SymbolicExpressionTreeGenealogyAnalyzer. Fixed node tool tips in the GenealogyGraphChart.

Location:

branches/HeuristicLab.EvolutionaryTracking

Files:

• HeuristicLab.EvolutionaryTracking.Views/3.4/GenealogyGraphChart.cs (modified) (1 diff)
• HeuristicLab.EvolutionaryTracking/3.4/Analyzers/SymbolicExpressionTreeGenealogyAnalyzer.cs (modified) (2 diffs)

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

@@ -101 +101 @@
             Data = node,
             ToolTipText = "Id: " + node.Label + nl +
-                          "Ranks: " + Graph[node].Ranks + nl +
+                          "Ranks: " + string.Join(",", Graph[node].Ranks.Select(r => r.ToString())) + nl +
                           "Quality: " + String.Format("{0:0.0000}", Graph[node].Quality) + nl +
                           "IsElite: " + Graph[node].IsElite

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

@@ -241 +241 @@
           var label = (generation * scopes.Count + i + 1).ToString(CultureInfo.InvariantCulture);
           if (!graph.HasNode(indiv)) {
-            var node = new GenealogyGraphNode(indiv) {
-              Label = label,
-            };
+            var node = new GenealogyGraphNode(indiv) { Label = label };
             graph.AddNode(node);
             // node metadata
@@ -249 +247 @@
             graph[node].Quality = scopes[i].Quality;
             graph[node].IsElite = i < Elites.Value;
+          } else {
+            var node = graph.GetNode(indiv);
+            graph[node].Ranks.Add(generation);
           }
           if (generation == 0) continue;