Changeset 9419 for branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking/3.4/GenericGraph/GenericGraph.cs

Timestamp:

05/02/13 13:18:57 (11 years ago)

Author:

bburlacu

Message:

#1772: Refactoring of directed graph components, added code for correctly serializing vertices and edges. Added specific building blocks analyzers and new population diversity analyzer which correctly integrates with the parallel engine.

Location:

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking/3.4/GenericGraph

Files:

• . (moved) (moved from branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking/3.4/DirectedGraph)
• GenericGraph.cs (copied) (copied from branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking/3.4/DirectedGraph/DirectedGraph.cs) (3 diffs)

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking/3.4/GenericGraph/GenericGraph.cs

@@ -31 +31 @@
   [Item("Directed graph", "Generic directed graph base class.")]
   [StorableClass]
-  public class DirectedGraph<T> : Item, IDirectedGraph<T> where T : class, IVertex {
+  public class GenericGraph<T> : Item, IGenericGraph<T> where T : class, IVertex {
     [Storable]
     private readonly List<T> nodes; // graph will consist of a set of nodes of type T
@@ -38 +38 @@
     }
 
-    public DirectedGraph() {
+    public GenericGraph() {
       nodes = new List<T>();
     }
 
-    public DirectedGraph(IDirectedGraph<T> g) {
+    public GenericGraph(IGenericGraph<T> g) {
       nodes = new List<T>(g.Nodes);
     }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new DirectedGraph<T>(this, cloner);
+      return new GenericGraph<T>(this, cloner);
     }
 
@@ -55 +55 @@
 
     [StorableConstructor]
-    protected DirectedGraph(bool serializing)
+    protected GenericGraph(bool serializing)
       : base(serializing) {
     }
 
-    protected DirectedGraph(DirectedGraph<T> original, Cloner cloner)
+    protected GenericGraph(GenericGraph<T> original, Cloner cloner)
       : base(original, cloner) {
       nodes = new List<T>(original.Nodes); // bburlacu: maybe the list should be empty