Changeset 10884 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/DirectedGraph/DirectedGraph.cs

Timestamp:

05/21/14 23:39:19 (10 years ago)

Author:

bburlacu

Message:

#1772: Added license headers where they were missing. Introduced an id map to the DirectedGraph to get graph vertices based on the id injected in the scopes by the genealogy analyzer.

File:

• branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/DirectedGraph/DirectedGraph.cs (modified) (7 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/DirectedGraph/DirectedGraph.cs

@@ -33 +33 @@
   public class DirectedGraph : Item, IDirectedGraph {
     [Storable]
-    protected readonly List<IVertex> nodes; // for performance reasons, maybe this should be a linked list (fast remove)
-    public List<IVertex> Nodes {
+    private readonly List<IVertex> nodes; // for performance reasons, maybe this should be a linked list (fast remove)
+    public IEnumerable<IVertex> Nodes {
       get { return nodes; }
     }
+
+    [Storable]
+    private readonly Dictionary<string, IVertex> idMap;
+
     [Storable]
     private readonly Dictionary<object, IVertex> contentMap;
@@ -42 +46 @@
       nodes = new List<IVertex>();
       contentMap = new Dictionary<object, IVertex>();
+      idMap = new Dictionary<string, IVertex>();
     }
     [StorableConstructor]
@@ -51 +56 @@
       nodes = new List<IVertex>(original.Nodes);
       contentMap = new Dictionary<object, IVertex>(original.contentMap);
+      idMap = new Dictionary<string, IVertex>(original.idMap);
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -62 +68 @@
       return contentMap.ContainsKey(content);
     }
+
+    public IVertex GetVertex(string id) {
+      IVertex result;
+      idMap.TryGetValue(id, out result);
+      return result;
+    }
+
     public IVertex this[object key] {
       get {
@@ -69 +82 @@
       }
       set {
+        if (contentMap.ContainsKey(key)) {
+          idMap.Remove(contentMap[key].Id);
+        }
         contentMap[key] = value;
+        idMap[value.Id] = value;
       }
     }
@@ -81 +98 @@
       nodes.Clear();
       contentMap.Clear();
+      idMap.Clear();
     }
     public virtual void AddVertex(IVertex vertex) {
@@ -87 +105 @@
       }
       contentMap[vertex.Content] = vertex;
-      Nodes.Add(vertex);
+      idMap[vertex.Id] = vertex;
+      nodes.Add(vertex);
     }