Changeset 11912 for trunk/sources/HeuristicLab.Core/3.3/Collections/DirectedGraph/Arc.cs

Timestamp:

02/05/15 13:55:04 (9 years ago)

Author:

bburlacu

Message:

#2223: Moved Data member to the generic versions of Vertex and Arc (restricted to be an IDeepCloneable). Fixed AddVertices method and added complementary AddArcs and RemoveArcs methods.

File:

• trunk/sources/HeuristicLab.Core/3.3/Collections/DirectedGraph/Arc.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Core/3.3/Collections/DirectedGraph/Arc.cs

@@ -56 +56 @@
     }
 
-    [Storable]
-    protected object data;
-    public object Data {
-      get { return data; }
-      set {
-        if (data == value) return;
-        data = value;
-        OnChanged(this, EventArgs.Empty);
-      }
-    }
 
     [StorableConstructor]
@@ -81 +71 @@
       label = original.Label;
       weight = original.Weight;
-      if (data is IDeepCloneable)
-        data = cloner.Clone((IDeepCloneable)data);
-      else data = original.Data;
     }
     public override IDeepCloneable Clone(Cloner cloner) { return new Arc(this, cloner); }
@@ -96 +83 @@
 
   [StorableClass]
-  public class Arc<T> : Arc, IArc<T> where T : class,IItem {
+  public class Arc<T> : Arc, IArc<T> where T : class,IDeepCloneable {
+    [Storable]
+    protected T data;
+    public T Data {
+      get { return data; }
+      set {
+        if (data == value) return;
+        data = value;
+        OnChanged(this, EventArgs.Empty);
+      }
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new Arc<T>(this, cloner);
+    }
+
+    protected Arc(Arc<T> original, Cloner cloner)
+      : base(original, cloner) {
+      if (original.Data != null)
+        Data = cloner.Clone(original.Data);
+    }
+
     public Arc(bool deserializing)
       : base(deserializing) {
@@ -108 +116 @@
       : base(original, cloner) {
     }
-
-    new public IVertex<T> Source {
-      get { return (IVertex<T>)base.Source; }
-    }
-    new public IVertex<T> Target {
-      get { return (IVertex<T>)base.Target; }
-    }
   }
 }