Changeset 11229 for branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/DirectedGraph/Vertex.cs

Timestamp:

07/29/14 16:20:08 (9 years ago)

Author:

bburlacu

Message:

#2215: Refactored and simplified DirectedGraph and related components API, simplified the BottomUpSimilarityCalculator by not using a directed graph and vertices but a simpler object so that the similarity calculator is self-contained.

File:

• branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/DirectedGraph/Vertex.cs (modified) (8 diffs)

branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/DirectedGraph/Vertex.cs

@@ -30 +30 @@
   [StorableClass]
   public class Vertex : Item, IVertex {
-    public event EventHandler PreContentChanged;
-    protected virtual void OnPreContentChanged(object sender, EventArgs args) {
-      var changed = PreContentChanged;
-      if (changed != null) {
+    // use the same event to signal a change in the content, weight or label
+    public event EventHandler Changed;
+    protected virtual void OnChanged(object sender, EventArgs args) {
+      var changed = Changed;
+      if (changed != null)
         changed(sender, args);
-      }
     }
 
-    public event EventHandler PostContentChanged;
-    protected virtual void OnPostContentChanged(object sender, EventArgs args) {
-      var changed = PostContentChanged;
-      if (changed != null) {
-        changed(sender, args);
+    public event EventHandler<EventArgs<IArc>> ArcAdded;
+    protected virtual void OnArcAdded(object sender, EventArgs<IArc> args) {
+      var added = ArcAdded;
+      if (added != null)
+        added(sender, args);
+    }
+
+    public event EventHandler<EventArgs<IArc>> ArcRemoved;
+    protected virtual void OnArcRemoved(object sender, EventArgs<IArc> args) {
+      var removed = ArcRemoved;
+      if (removed != null)
+        removed(sender, args);
+    }
+
+    [Storable]
+    protected string label;
+    public string Label {
+      get { return label; }
+      set {
+        label = value;
+        OnChanged(this, EventArgs.Empty);
       }
     }
 
     [Storable]
-    private string id;
-
-    public string Id {
-      get { return id; }
+    protected double weight;
+    public double Weight {
+      get { return weight; }
+      set {
+        weight = value;
+        OnChanged(this, EventArgs.Empty);
+      }
     }
-
-    [Storable]
-    public string Label { get; set; }
-
-    [Storable]
-    public double Weight { get; set; }
 
     [Storable]
@@ -64 +77 @@
       get { return content; }
       set {
-        OnPreContentChanged(this, EventArgs.Empty);
         content = value;
-        OnPostContentChanged(this, EventArgs.Empty);
+        OnChanged(this, EventArgs.Empty);
       }
     }
@@ -73 +85 @@
     public IEnumerable<IArc> InArcs {
       get { return inArcs ?? Enumerable.Empty<IArc>(); }
-      set { inArcs = value.ToList(); }
     }
 
@@ -79 +90 @@
     public IEnumerable<IArc> OutArcs {
       get { return outArcs ?? Enumerable.Empty<IArc>(); }
-      set { outArcs = value.ToList(); }
     }
 
@@ -85 +95 @@
     public Vertex(bool deserializing) : base(deserializing) { }
 
-    public Vertex() {
-      id = Guid.NewGuid().ToString();
-    }
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() { }
+
+    private Vertex() { }
 
     public Vertex(object content)
@@ -96 +107 @@
     protected Vertex(Vertex original, Cloner cloner)
       : base(original, cloner) {
-      id = Guid.NewGuid().ToString();
       content = original.content;
-      Label = original.Label;
-      Weight = original.Weight;
-      inArcs = new List<IArc>(original.inArcs);
-      outArcs = new List<IArc>(original.outArcs);
+      label = original.Label;
+      weight = original.Weight;
+
+      inArcs = original.InArcs.Select(cloner.Clone).ToList();
+      outArcs = original.OutArcs.Select(cloner.Clone).ToList();
     }
 
@@ -108 +119 @@
     }
 
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-      if (Id == null) {
-        id = Guid.NewGuid().ToString();
+    public void AddArc(IArc arc) {
+      if (this != arc.Source && this != arc.Target)
+        throw new InvalidOperationException("The current vertex must be either the arc source or the arc target.");
+
+      if (this == arc.Source) {
+        if (outArcs == null)
+          outArcs = new List<IArc>();
+        else if (outArcs.Contains(arc) || outArcs.Any(a => a.Target == arc.Target && a.Source == arc.Source))
+          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) || inArcs.Any(a => a.Target == arc.Target && a.Source == arc.Source))
+          throw new InvalidOperationException("Arc already added.");
+        inArcs.Add(arc);
+      }
+      OnArcAdded(this, new EventArgs<IArc>(arc));
+    }
+
+    public void RemoveArc(IVertex vertex) {
+      try {
+        var arc = inArcs.Concat(outArcs).SingleOrDefault(x => x.Target == vertex || x.Source == vertex);
+        RemoveArc(arc);
+      }
+      catch (Exception) {
+        throw new InvalidOperationException("Only one arc allowed between two vertices");
       }
     }
 
-    // this method can be used to add arcs towards targets that are not visible in the graph 
-    // (they do not appear in the nodes Dictionary). It is the programmers responsibility to 
-    // enforce the correct and desired behavior.
-    public void AddForwardArc(IArc arc) {
-      if (arc.Source != this) { throw new Exception("AddForwardArc: Source should be equal to this."); }
-      if (outArcs == null)
-        outArcs = new List<IArc>();
-      outArcs.Add(arc);
+    public void RemoveArc(IArc arc) {
+      if (this != arc.Source && this != arc.Target)
+        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.");
+      }
+      OnArcRemoved(this, new EventArgs<IArc>(arc));
     }
-    public void AddReverseArc(IArc arc) {
-      if (arc.Target != this) { throw new Exception("AddReverseArc: Target should be equal to this."); };
-      if (inArcs == null)
-        inArcs = new List<IArc>();
-      inArcs.Add(arc);
-    }
+
     public int InDegree { get { return InArcs.Count(); } }
     public int OutDegree { get { return OutArcs.Count(); } }
@@ -141 +174 @@
       set { base.Content = value; }
     }
-
-    public Vertex() { }
 
     [StorableConstructor]