Changeset 9419 for branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking/3.4/GenericGraph/Vertex.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)
• Vertex.cs (copied) (copied from branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking/3.4/DirectedGraph/Vertex.cs) (3 diffs)

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

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using HeuristicLab.Common;
+using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.EvolutionaryTracking {
   [StorableClass]
-  public class Vertex : IVertex {
-    public string Id { get; private set; }
-    public string Label { get; set; }
-    public double Weight { get; set; }
-    public List<Arc> InEdges { get; private set; }
-    public List<Arc> OutEdges { get; private set; }
-    private object content;
+  public class Vertex : Item, IVertex
+  {
+    [Storable]
+    private string id;
+    public string Id { get { return id; } }
+    [Storable] private string label;
+    public string Label { get { return label; } set { label = value; } }
+    [Storable] private double weight;
+    public double Weight { get { return weight; } set { weight = value; } }
+    [Storable] private List<IEdge> inEdges; 
+    public List<IEdge> InEdges { get { return inEdges; } private set { inEdges = value; } }
+    [Storable] private List<IEdge> outEdges;
+    public List<IEdge> OutEdges { get { return outEdges; }private set { outEdges = value; }}
+    [Storable] private object content;
     public object Content {
       get { return content; }
@@ -43 +52 @@
 
     [StorableConstructor]
-    public Vertex(bool deserializing) { }
+    public Vertex(bool deserializing) : base(deserializing) { }
 
     public Vertex() {
-      Id = Guid.NewGuid().ToString();
+      id = Guid.NewGuid().ToString();
+    }
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization()
+    {
+      if (id == null) {
+        id = Guid.NewGuid().ToString();
+      }
+    }
+
+    protected Vertex(Vertex original, Cloner cloner)
+      : base(original, cloner) {
+      Content = original.Content;
+      id = Guid.NewGuid().ToString();
+      Label = original.Label;
+      Content = original.Content;
+      InEdges = new List<IEdge>(original.InEdges);
+      OutEdges = new List<IEdge>(original.OutEdges);
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new Vertex(this, cloner);
     }
 
     public Vertex(Vertex node) {
-      Id = Guid.NewGuid().ToString();
+      id = Guid.NewGuid().ToString();
       Label = node.Label;
       Content = node.Content;
-      InEdges = new List<Arc>(node.InEdges);
-      OutEdges = new List<Arc>(node.OutEdges);
+      InEdges = new List<IEdge>(node.InEdges);
+      OutEdges = new List<IEdge>(node.OutEdges);
     }
 
@@ -108 +139 @@
     public void AddForwardArc(IVertex target, double weight = 0.0, object data = null) {
       var e = new Arc { Source = this, Target = target, Data = data, Weight = weight };
-      if (OutEdges == null) OutEdges = new List<Arc> { e };
+      if (OutEdges == null) OutEdges = new List<IEdge> { e };
       else OutEdges.Add(e);
     }
-    public void AddForwardArc(Arc arc) {
+    public void AddForwardArc(IEdge arc) {
       if (arc.Source == null) { arc.Source = this; }
       if (arc.Source != this) { throw new Exception("AddForwardArc: Source should be equal to this."); }
-      if (OutEdges == null) { OutEdges = new List<Arc> { arc }; } else { OutEdges.Add(arc); }
+      if (OutEdges == null) { OutEdges = new List<IEdge> { arc }; } else { OutEdges.Add(arc); }
     }
-    public void AddReverseArc(Arc arc) {
+    public void AddReverseArc(IEdge arc) {
       if (arc.Target == null) { arc.Target = this; }
       if (arc.Target != this) { throw new Exception("AddReverseArc: Target should be equal to this."); };
-      if (InEdges == null) { InEdges = new List<Arc> { arc }; } else { InEdges.Add(arc); }
+      if (InEdges == null) { InEdges = new List<IEdge> { arc }; } else { InEdges.Add(arc); }
     }
     public void AddReverseArc(IVertex source, double weight = 0.0, object data = null) {
       var e = new Arc { Source = source, Target = this, Data = data, Weight = weight };
-      if (InEdges == null) InEdges = new List<Arc> { e };
+      if (InEdges == null) InEdges = new List<IEdge> { e };
       else InEdges.Add(e);
     }