Changeset 11241 for trunk/sources/HeuristicLab.Core/3.3/Collections/DirectedGraph/Vertex.cs

Timestamp:

07/30/14 15:02:27 (10 years ago)

Author:

mkommend

Message:

#2223: Copied directed graph implented in bottom up tree distance branch into the trunk.

Location:

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

Files:

• . (added)
• Vertex.cs (copied) (copied from branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/DirectedGraph/Vertex.cs) (7 diffs)

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

@@ -24 +24 @@
 using System.Linq;
 using HeuristicLab.Common;
-using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
+namespace HeuristicLab.Core {
   [StorableClass]
   public class Vertex : Item, IVertex {
     [Storable]
-    protected string label;
+    private string label;
     public string Label {
       get { return label; }
@@ -42 +41 @@
 
     [Storable]
-    protected double weight;
+    private double weight;
     public double Weight {
       get { return weight; }
@@ -53 +52 @@
 
     [Storable]
-    protected object content;
-    public object Content {
-      get { return content; }
+    private IDeepCloneable data;
+    public IDeepCloneable Data {
+      get { return data; }
       set {
-        if (content == value) return;
-        content = value;
+        if (data == value) return;
+        data = value;
         OnChanged(this, EventArgs.Empty);
       }
     }
 
-    private List<IArc> inArcs;
+    private readonly List<IArc> inArcs = new List<IArc>();
     public IEnumerable<IArc> InArcs {
-      get { return inArcs ?? Enumerable.Empty<IArc>(); }
+      get { return inArcs; }
     }
 
-    private List<IArc> outArcs;
+    private readonly List<IArc> outArcs = new List<IArc>();
     public IEnumerable<IArc> OutArcs {
-      get { return outArcs ?? Enumerable.Empty<IArc>(); }
+      get { return outArcs; }
     }
 
@@ -83 +82 @@
     private void AfterDeserialization() { }
 
-    public Vertex(object content) {
-      this.content = content;
+    public Vertex(IDeepCloneable data) {
+      this.data = data;
     }
 
     protected Vertex(Vertex original, Cloner cloner)
       : base(original, cloner) {
-      content = original.content;
+      data = cloner.Clone(original.Data);
       label = original.Label;
       weight = original.Weight;
@@ -106 +105 @@
 
       if (this == arc.Source) {
-        if (outArcs == null)
-          outArcs = new List<IArc>();
-        else if (outArcs.Contains(arc))
-          throw new InvalidOperationException("Arc already added.");
+        if (outArcs.Contains(arc)) throw new InvalidOperationException("Arc already added.");
         outArcs.Add(arc);
-      } else if (this == arc.Target) {
-        if (inArcs == null)
-          inArcs = new List<IArc>();
-        else if (inArcs.Contains(arc))
-          throw new InvalidOperationException("Arc already added.");
+      }
+      if (this == arc.Target) {
+        if (inArcs.Contains(arc)) throw new InvalidOperationException("Arc already added.");
         inArcs.Add(arc);
       }
@@ -125 +119 @@
         throw new InvalidOperationException("The current vertex must be either the arc source or the arc target.");
 
-      if (this == arc.Source && outArcs != null) {
-        if (!outArcs.Remove(arc))
-          throw new InvalidOperationException("Arc is not present in this vertex' outgoing arcs.");
-      } else if (this == arc.Target && inArcs != null) {
-        if (!inArcs.Remove(arc))
-          throw new InvalidOperationException("Arc is not present in this vertex' incoming arcs.");
+      if (this == arc.Source) {
+        if (!outArcs.Remove(arc)) throw new InvalidOperationException("Arc is not present in this vertex' outgoing arcs.");
+      }
+      if (this == arc.Target) {
+        if (!inArcs.Remove(arc)) throw new InvalidOperationException("Arc is not present in this vertex' incoming arcs.");
       }
       OnArcRemoved(this, new EventArgs<IArc>(arc));
@@ -162 +155 @@
   [StorableClass]
   public class Vertex<T> : Vertex, IVertex<T> where T : class,IItem {
-    public new T Content {
-      get { return (T)base.Content; }
-      set { base.Content = value; }
+    public new T Data {
+      get { return (T)base.Data; }
+      set { base.Data = value; }
     }