Changeset 11502 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4

Timestamp:

10/26/14 22:07:40 (10 years ago)

Author:

bburlacu

Message:

#1772: Small refactoring in the GenealogyGraph.

Location:

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/GenealogyGraph

Files:

• GenealogyGraph.cs (modified) (4 diffs)
• GenealogyGraphArc.cs (modified) (1 diff)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/GenealogyGraph/GenealogyGraph.cs

@@ -45 +45 @@
     protected GenealogyGraph(GenealogyGraph original, Cloner cloner)
       : base(original, cloner) {
-      Ranks = new Dictionary<double, List<IGenealogyGraphNode>>(original.Ranks);
-      contentMap = new Dictionary<object, IGenealogyGraphNode>(original.contentMap);
-      idMap = new Dictionary<string, IGenealogyGraphNode>(original.idMap);
+      RebuildDictionaries();
     }
 
@@ -61 +59 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
-      contentMap = new Dictionary<object, IGenealogyGraphNode>();
-      idMap = new Dictionary<string, IGenealogyGraphNode>();
-      ranks = new Dictionary<double, List<IGenealogyGraphNode>>();
-
-      foreach (var v in Vertices) {
-        contentMap[v.Data] = v;
-        idMap[v.Id] = v;
-        if (ranks.ContainsKey(v.Rank)) {
-          ranks[v.Rank].Add(v);
-        } else {
-          ranks[v.Rank] = new List<IGenealogyGraphNode> { v };
-        }
-      }
+      RebuildDictionaries();
     }
 
@@ -151 +137 @@
     }
 
+    private void RebuildDictionaries() {
+      contentMap = new Dictionary<object, IGenealogyGraphNode>();
+      idMap = new Dictionary<string, IGenealogyGraphNode>();
+      ranks = new Dictionary<double, List<IGenealogyGraphNode>>();
+
+      foreach (var v in Vertices) {
+        contentMap[v.Data] = v;
+        idMap[v.Id] = v;
+        if (ranks.ContainsKey(v.Rank)) {
+          ranks[v.Rank].Add(v);
+        } else {
+          ranks[v.Rank] = new List<IGenealogyGraphNode> { v };
+        }
+      }
+    }
+
     public void ExportDot(string path) {
       var sb = new StringBuilder();
@@ -157 +159 @@
         sb.AppendLine("\"" + v.Id + "\"[shape=circle, style = filled, width = " + v.Degree / 2.0 + ", label = " + v.Rank + ", fillcolor = \"" + ColorTranslator.ToHtml(GetColor(v)) + "\"]");
       }
-      foreach (var a in Arcs.Select(x => (IGenealogyGraphArc)x)) {
+      foreach (var a in Arcs) {
         sb.AppendLine("\"" + a.Source.Id + "\" -- \"" + a.Target.Id + "\"");
       }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/GenealogyGraph/GenealogyGraphArc.cs

@@ -55 +55 @@
     [StorableConstructor]
     protected GenealogyGraphArc(bool deserializing) : base(deserializing) { }
-    protected GenealogyGraphArc(GenealogyGraphArc<T> original, Cloner cloner)
+    protected GenealogyGraphArc(GenealogyGraphArc original, Cloner cloner)
       : base(original, cloner) {
-      Data = original.Data;
     }