Changeset 9419 for branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking/3.4/GenericGraph/Arc.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)
• Arc.cs (modified) (1 diff)

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

@@ -1 @@
-
+using HeuristicLab.Common;
+using HeuristicLab.Core;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+
 namespace HeuristicLab.EvolutionaryTracking {
   /// <summary>
   /// An arc that can have a weight, a label, and can old additional information in the Data object
   /// </summary>
-  public class Arc {
-    public IVertex Source { get; set; }
-    public IVertex Target { get; set; }
-    public string Label { get; set; }
-    public double Weight { get; set; }
-    public object Data { get; set; }
+  [StorableClass]
+  public class Arc : Item, IEdge
+  {
+    [Storable] private IVertex source;
+    public IVertex Source { get { return source; } set { source = value; } }
+    [Storable] private IVertex target;
+    public IVertex Target { get { return target; } set { target = value; } }
+    [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 object data;
+    public object Data { get { return data; } set { data = value; } }
+
+    [StorableConstructor]
+    public Arc(bool deserializing) : base(deserializing) {}
+
+    public Arc() {}
+
+    private Arc(Arc original, Cloner cloner) : base(original, cloner)
+    {
+      Source = original.Source;
+      Target = original.Target;
+      Label = original.Label;
+      Weight = original.Weight;
+      Data = original.Data;
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner)
+    {
+      return new Arc(this, cloner);
+    }
   }
 }