Changeset 10886 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/GenealogyGraph

Timestamp:

05/22/14 13:49:35 (10 years ago)

Author:

bburlacu

Message:

#1772: Simplified GenealogyGraph (and related components) API in an effort to improve speed and memory consumption (eg., by sharing the same arc when walking the graph in both directions: parent-child and child-parent).

Location:

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

Files:

• GenealogyGraph.cs (modified) (2 diffs)
• GenealogyGraphArc.cs (modified) (2 diffs)
• GenealogyGraphNode.cs (modified) (1 diff)
• Interfaces/IGenealogyGraph.cs (modified) (1 diff)

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

@@ -40 +40 @@
       get { return from n in base.Nodes select (IGenealogyGraphNode)n; }
     }
+
+    public IGenealogyGraphArc AddArc(IGenealogyGraphNode source, IGenealogyGraphNode target) {
+      var arc = new GenealogyGraphArc(source, target);
+      source.AddForwardArc(arc);
+      target.AddReverseArc(arc);
+      return arc;
+    }
+
     protected GenealogyGraph(GenealogyGraph original, Cloner cloner)
       : base(original, cloner) {
@@ -98 +106 @@
       get { return from n in base.Nodes select (IGenealogyGraphNode<T>)n; }
     }
+
+    public IGenealogyGraphArc AddArc(IGenealogyGraphNode source, IGenealogyGraphNode target) {
+      var arc = new GenealogyGraphArc(source, target);
+      source.AddForwardArc(arc);
+      target.AddReverseArc(arc);
+      return arc;
+    }
+
     // contructors
     protected GenealogyGraph(GenealogyGraph<T> original, Cloner cloner)

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

@@ -32 +32 @@
     protected GenealogyGraphArc(GenealogyGraphArc original, Cloner cloner)
       : base(original, cloner) {
+      this.Target = original.Target;
+      this.Source = original.Source;
+      this.Label = original.Label;
+      this.Weight = original.Weight;
+      this.Data = original.Data;
     }
 
-    public GenealogyGraphArc() { }
+    protected GenealogyGraphArc() { }
+
+    public GenealogyGraphArc(IGenealogyGraphNode source, IGenealogyGraphNode target, object data = null) {
+      Source = source;
+      Target = target;
+      Data = data;
+    }
 
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -60 +71 @@
       Data = (T)original.Data.Clone();
     }
-    public GenealogyGraphArc() { }
 
     public override IDeepCloneable Clone(Cloner cloner) {

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

@@ -107 +107 @@
       return Quality.CompareTo(other.Quality);
     }
-    public new void AddForwardArc(IVertex target, double w = 0.0, object data = null) {
-      var arc = new GenealogyGraphArc { Source = this, Target = (IGenealogyGraphNode)target, Data = data, Weight = w };
-      base.AddForwardArc(arc);
-    }
-    public new void AddReverseArc(IVertex source, double w = 0.0, object data = null) {
-      var arc = new GenealogyGraphArc { Source = (IGenealogyGraphNode)source, Target = this, Data = data, Weight = w };
-      base.AddReverseArc(arc);
-    }
     public IEnumerable<IGenealogyGraphNode> Parents {
       get { return InArcs.Select(a => a.Source); }

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

@@ -27 +27 @@
     Dictionary<double, List<IGenealogyGraphNode>> Ranks { get; }
     new IEnumerable<IGenealogyGraphNode> Nodes { get; }
+    IGenealogyGraphArc AddArc(IGenealogyGraphNode source, IGenealogyGraphNode target);
   }