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

Timestamp:

01/07/14 21:44:36 (10 years ago)

Author:

bburlacu

Message:

#1772: Cleaned up the design of the generic genealogy analyzer and related classes, created generic genealogy graph view. Added instrumentation code to TravelingSalesmapProblem.cs allowing genealogy tracking. Merged trunk changes (instrumentation for multi operators).

File:

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

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

@@ -31 +31 @@
   [Item("DirectedGraph", "Generic class representing a directed graph with custom vertices and content")]
   [StorableClass]
-  public class DirectedGraph<TVertex> : Item, IDirectedGraph<TVertex> where TVertex : class,IVertex {
+  public class DirectedGraph : Item, IDirectedGraph {
     [Storable]
-    protected readonly List<TVertex> nodes; // for performance reasons, maybe this should be a linked list (fast remove)
-    public List<TVertex> Nodes {
+    protected readonly List<IVertex> nodes; // for performance reasons, maybe this should be a linked list (fast remove)
+    public List<IVertex> Nodes {
       get { return nodes; }
     }
+    [Storable]
+    private readonly Dictionary<object, List<IVertex>> contentMap;
     public DirectedGraph() {
-      nodes = new List<TVertex>();
+      nodes = new List<IVertex>();
+      contentMap = new Dictionary<object, List<IVertex>>();
     }
     [StorableConstructor]
@@ -44 +47 @@
       : base(serializing) {
     }
-    protected DirectedGraph(DirectedGraph<TVertex> original, Cloner cloner)
+    protected DirectedGraph(DirectedGraph original, Cloner cloner)
       : base(original, cloner) {
-      nodes = new List<TVertex>(original.Nodes);
+      nodes = new List<IVertex>(original.Nodes);
+      contentMap = new Dictionary<object, List<IVertex>>(original.contentMap);
     }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new DirectedGraph<TVertex>(this, cloner);
+      return new DirectedGraph(this, cloner);
     }
-    public bool Contains(TVertex t) {
+    public bool Contains(IVertex t) {
       return nodes.Contains(t);
     }
 
-    public virtual bool Any(Func<TVertex, bool> predicate) {
+    public bool Contains(object content) {
+      return contentMap.ContainsKey(content);
+    }
+    public List<IVertex> this[object key] {
+      get {
+        List<IVertex> result;
+        contentMap.TryGetValue(key, out result);
+        return result;
+      }
+    }
+    public virtual bool Any(Func<IVertex, bool> predicate) {
       return nodes.Any(predicate);
     }
@@ -61 +75 @@
       get { return !nodes.Any(); }
     }
-
     public virtual void Clear() {
       nodes.Clear();
     }
-
-    public virtual void AddVertex(TVertex vertex) {
+    public virtual void AddVertex(IVertex vertex) {
       Nodes.Add(vertex);
+      if (!contentMap.ContainsKey(vertex.Content))
+        contentMap[vertex.Content] = new List<IVertex>();
+      contentMap[vertex.Content].Add(vertex);
     }
 
-    public virtual void RemoveVertex(TVertex vertex) {
+    public virtual void RemoveVertex(IVertex vertex) {
       nodes.Remove(vertex);
     }
@@ -77 +92 @@
     }
   }
-
-  [Item("Directed graph", "Generic directed graph base class.")]
-  [StorableClass]
-  public class DirectedGraph<TVertex, TContent> : DirectedGraph<TVertex>, IDirectedGraph<TVertex, TContent>
-    where TVertex : class,IVertex<TContent>
-    where TContent : class,IItem {
-
-    [StorableConstructor]
-    protected DirectedGraph(bool deserializing) : base(deserializing) { }
-
-    [Storable]
-    private readonly Dictionary<TContent, List<TVertex>> contentMap; // reverse mapping of content to the actual vertices
-    public DirectedGraph() {
-      contentMap = new Dictionary<TContent, List<TVertex>>();
-    }
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new DirectedGraph<TVertex, TContent>(this, cloner);
-    }
-    protected DirectedGraph(DirectedGraph<TVertex, TContent> original, Cloner cloner)
-      : base(original, cloner) {
-      contentMap = new Dictionary<TContent, List<TVertex>>(original.contentMap);
-    }
-    public bool Contains(TContent content) {
-      return contentMap.ContainsKey(content);
-    }
-    public List<TVertex> this[TContent key] {
-      get {
-        List<TVertex> result = null;
-        contentMap.TryGetValue(key, out result);
-        return result;
-      }
-      //      set {
-      //        contentMap[key] = value;
-      //      }
-    }
-    public override void Clear() {
-      contentMap.Clear();
-      base.Clear();
-    }
-    public override void AddVertex(TVertex vertex) {
-      if (contentMap.ContainsKey(vertex.Content)) {
-        contentMap[vertex.Content].Add(vertex);
-      } else {
-        contentMap[vertex.Content] = new List<TVertex> { vertex };
-      }
-      base.AddVertex(vertex);
-    }
-
-    public override void RemoveVertex(TVertex vertex) {
-      if (contentMap.ContainsKey(vertex.Content)) {
-        contentMap[vertex.Content].Remove(vertex);
-      }
-      base.RemoveVertex(vertex);
-    }
-  }
 }