Changeset 11694 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/GenealogyGraph/GenealogyGraph.cs

Timestamp:

12/17/14 18:52:37 (9 years ago)

Author:

bburlacu

Message:

#1772: Fixed cloning in tracking operators for symbolic data analysis. Added unit tests (in progress).

File:

• branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/GenealogyGraph/GenealogyGraph.cs (modified) (3 diffs)

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

@@ -46 +46 @@
       : base(original, cloner) {
       RebuildDictionaries();
+
+      foreach (var arcs in Vertices.Select(v => (List<IArc>)((Vertex)v).InArcs)) {
+        arcs.Sort((a, b) => {
+          if (a.Data == b.Data)
+            return 0;
+          if (a.Data == null)
+            return -1;
+          return 1;
+        });
+      }
     }
 
@@ -60 +70 @@
     private void AfterDeserialization() {
       RebuildDictionaries();
+
+      foreach (var arcs in Vertices.Select(v => (List<IArc>)((Vertex)v).InArcs)) {
+        arcs.Sort((a, b) => {
+          if (a.Data == b.Data)
+            return 0;
+          if (a.Data == null)
+            return -1;
+          return 1;
+        });
+      }
     }
 
@@ -91 +111 @@
         throw new InvalidOperationException("Duplicate ids are not allowed in the genealogy graph.");
       idMap[genealogyGraphNode.Id] = genealogyGraphNode;
-      if (!Ranks.ContainsKey(genealogyGraphNode.Rank))
-        Ranks[genealogyGraphNode.Rank] = new List<IGenealogyGraphNode>();
-      Ranks[genealogyGraphNode.Rank].Add(genealogyGraphNode);
+      if (!ranks.ContainsKey(genealogyGraphNode.Rank))
+        ranks[genealogyGraphNode.Rank] = new List<IGenealogyGraphNode>();
+      ranks[genealogyGraphNode.Rank].Add(genealogyGraphNode);
     }