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

Timestamp:

07/31/14 17:11:39 (10 years ago)

Author:

bburlacu

Message:

#1772: Ported the rest of the changes to the DirectedGraph and Vertex to the GenealogyGraph and GenealogyGraphNode. Adapted tracking operators, analyzers and views.

File:

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

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

@@ -69 +69 @@
     public override IArc AddArc(IVertex source, IVertex target) {
       var arc = new GenealogyGraphArc((IGenealogyGraphNode)source, (IGenealogyGraphNode)target);
-      source.AddArc(arc);
-      target.AddArc(arc);
-      arcs.Add(arc);
+      base.AddArc(arc);
       return arc;
     }
@@ -82 +80 @@
       Ranks[node.Rank].Add(node);
 
-      if (contentMap.ContainsKey(node.Content))
+      if (contentMap.ContainsKey(node.Data))
         throw new InvalidOperationException("Duplicate content is not allowed in the genealogy graph.");
-      contentMap[node.Content] = node;
+      contentMap[node.Data] = node;
 
       if (idMap.ContainsKey(node.Id))
         throw new InvalidOperationException("Duplicate content is not allowed in the genealogy graph.");
       idMap[node.Id] = node;
-
-      vertex.Changed += OnVertexChanged;
     }
 
     public override void RemoveVertex(IVertex vertex) {
       var node = (IGenealogyGraphNode)vertex;
-      contentMap.Remove(node.Content);
+      contentMap.Remove(node.Data);
       idMap.Remove(node.Id);
       if (Ranks.ContainsKey(node.Rank)) {
@@ -129 +125 @@
       ranks.Clear();
     }
-
-    protected override void OnVertexChanged(object sender, EventArgs args) {
-      base.OnVertexChanged(sender, args);
-
-      var vertex = (IGenealogyGraphNode)sender;
-      if (!contentMap.ContainsKey(vertex.Content)) {
-        // vertex has received new content
-      }
-    }
   }
 
-  //  [StorableClass]
-  //  [Item("GenealogyGraph", "A class representing a genealogy graph")]
-  //  public class GenealogyGraph<T> : DirectedGraph, IGenealogyGraph<T> where T : class, IItem {
-  //    // members and properties
-  //    [Storable]
-  //    private Dictionary<double, List<IGenealogyGraphNode>> ranks;
-  //    public Dictionary<double, List<IGenealogyGraphNode>> Ranks {
-  //      get { return ranks; }
-  //      set { ranks = value; }
-  //    }
-  //    public new IEnumerable<IGenealogyGraphNode<T>> Vertices {
-  //      get { return from n in base.Vertices select (IGenealogyGraphNode<T>)n; }
-  //    }
-  //    // contructors
-  //    protected GenealogyGraph(GenealogyGraph<T> original, Cloner cloner)
-  //      : base(original, cloner) {
-  //    }
-  //    public override IDeepCloneable Clone(Cloner cloner) {
-  //      return new GenealogyGraph<T>(this, cloner);
-  //    }
-  //
-  //    [StorableConstructor]
-  //    protected GenealogyGraph(bool deserializing) : base(deserializing) { }
-  //    public GenealogyGraph() {
-  //      Ranks = new Dictionary<double, List<IGenealogyGraphNode>>();
-  //    }
-  //
-  //    // methods
-  //    public override void AddVertex(IVertex vertex) {
-  //      base.AddVertex(vertex);
-  //      var node = (IGenealogyGraphNode)vertex;
-  //      if (!Ranks.ContainsKey(node.Rank)) {
-  //        Ranks[node.Rank] = new List<IGenealogyGraphNode>();
-  //      }
-  //      Ranks[node.Rank].Add(node);
-  //    }
-  //
-  //    public override void RemoveVertex(IVertex vertex) {
-  //      var node = (IGenealogyGraphNode<T>)vertex;
-  //      if (Ranks.ContainsKey(node.Rank)) {
-  //        Ranks[node.Rank].Remove(node);
-  //      }
-  //      base.RemoveVertex(vertex);
-  //    }
-  //
-  //    public override IArc AddArc(IVertex source, IVertex target) {
-  //      var arc = new GenealogyGraphArc((IGenealogyGraphNode)source, (IGenealogyGraphNode)target);
-  //      source.AddArc(arc);
-  //      target.AddArc(arc);
-  //      arcs.Add(arc);
-  //      return arc;
-  //    }
-  //
-  //    IEnumerable<IGenealogyGraphNode> IGenealogyGraph.Vertices {
-  //      get { return Vertices; }
-  //    }
-  //
-  //    public IGenealogyGraphNode GetByContent(object content)
-  //    {
-  //      IGenealogyGraphNode result;
-  //      contentMap.
-  //    }
-  //
-  //    public event EventHandler GraphUpdated;
-  //    private void OnGraphUpdated(object sender, EventArgs args) {
-  //      var updated = GraphUpdated;
-  //      if (updated != null) updated(sender, args);
-  //    }
-  //  }
+  [Item("GenealogyGraph", "A specialization of the genealogy graph with T as content for vertices")]
   [StorableClass]
-
-  [Item("GenealogyGraph", "A specialization of the genealogy graph with T as content for vertices")]
   public class GenealogyGraph<T> : GenealogyGraph, IGenealogyGraph<T> where T : class, IItem {
     public new IEnumerable<IGenealogyGraphNode<T>> Vertices {