Changeset 11969 for branches

Timestamp:

02/07/15 02:52:06 (10 years ago)

Author:

bburlacu

Message:

#1772: Restore correct order of arcs when cloning or deserializing a GenealogyGraph (due to changes in the trunk in the Directed graph, previous code was not working anymore).

File:

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

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

@@ -38 +38 @@
 
     private readonly Comparison<IArc<IDeepCloneable>> compareArcs = (a, b) => {
-      if (a.Data == b.Data)
+      var da = a.Data;
+      var db = b.Data;
+
+      if ((da == null && db == null) || (da != null && db != null))
         return 0;
-      if (a.Data == null)
+
+      if (da == null)
         return -1;
+
       return 1;
     };
@@ -55 +60 @@
       : base(original, cloner) {
       RebuildDictionaries();
-
-      foreach (var arcs in Vertices.Select(v => v.InArcs.ToList())) { arcs.Sort(compareArcs); }
+      // sort arcs so that in the case of crossover (child vertex with two parents)
+      // the arc which holds the fragment information is always last
+      foreach (var arcList in base.Vertices.Select(v => (List<IArc>)v.InArcs)) {
+        arcList.Sort((a, b) => compareArcs((IGenealogyGraphArc)a, (IGenealogyGraphArc)b));
+      }
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -69 +77 @@
     private void AfterDeserialization() {
       RebuildDictionaries();
-      foreach (var arcs in Vertices.Select(v => v.InArcs.ToList())) { arcs.Sort(compareArcs); }
+      foreach (var arcList in base.Vertices.Select(v => (List<IArc>)v.InArcs)) {
+        arcList.Sort((a, b) => compareArcs((IGenealogyGraphArc)a, (IGenealogyGraphArc)b));
+      }
     }
     public GenealogyGraph() {