Changeset 11238

Timestamp:

07/30/14 13:06:52 (10 years ago)

Author:

bburlacu

Message:

#2215: Updated interfaces and graph components according to the reviewer comments (IDirectedGraph, DirectedGraph, Vertex, Arc).

Location:

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

Files:

• Arc.cs (modified) (5 diffs)
• DirectedGraph.cs (modified) (8 diffs)
• Interfaces/IDirectedGraph.cs (modified) (2 diffs)
• Interfaces/IVertex.cs (modified) (1 diff)
• Vertex.cs (modified) (9 diffs)

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

@@ -31 +31 @@
   [StorableClass]
   public class Arc : Item, IArc {
-    public event EventHandler Changed;
-    protected virtual void OnChanged(object sender, EventArgs args) {
-      var changed = Changed;
-      if (changed != null)
-        changed(sender, args);
-    }
-
     [Storable]
     public IVertex Source { get; private set; }
@@ -49 +42 @@
       get { return label; }
       set {
+        if (label.Equals(value)) return;
         label = value;
         OnChanged(this, EventArgs.Empty);
@@ -59 +53 @@
       get { return weight; }
       set {
+        if (weight.Equals(value)) return;
         weight = value;
         OnChanged(this, EventArgs.Empty);
@@ -69 +64 @@
       get { return data; }
       set {
+        if (data == value) return;
         data = value;
         OnChanged(this, EventArgs.Empty);
@@ -94 +90 @@
       return new Arc(this, cloner);
     }
+
+    public event EventHandler Changed;
+    protected virtual void OnChanged(object sender, EventArgs args) {
+      var changed = Changed;
+      if (changed != null)
+        changed(sender, args);
+    }
   }
 

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

@@ -56 +56 @@
         vertex.ArcAdded += OnArcAdded;
         vertex.ArcRemoved += OnArcRemoved;
-        vertex.Changed += OnVertexChanged;
       }
 
@@ -64 +63 @@
         source.AddArc(arc);
         target.AddArc(arc);
-        arc.Changed += OnArcChanged;
       }
     }
@@ -91 +89 @@
       vertices.Add(vertex);
       // register event handlers
-      vertex.Changed += OnVertexChanged;
       vertex.ArcAdded += OnArcAdded;
       vertex.ArcRemoved += OnArcRemoved;
@@ -99 +96 @@
       vertices.Remove(vertex);
       // remove connections to/from the removed vertex
-      var arcList = vertex.InArcs.Concat(vertex.OutArcs).ToList();
+      var arcList = vertex.InArcs.Concat(vertex.OutArcs).ToList(); // avoid invalid operation exception: "collection was modified" below
       foreach (var arc in arcList)
         RemoveArc(arc);
@@ -105 +102 @@
       vertex.ArcAdded -= OnArcAdded;
       vertex.ArcRemoved -= OnArcRemoved;
-      vertex.Changed -= OnVertexChanged;
     }
 
@@ -130 +126 @@
     }
 
-    protected virtual void OnVertexChanged(object sender, EventArgs args) { }
-
     protected virtual void OnArcAdded(object sender, EventArgs<IArc> args) {
       var arc = args.Value;
@@ -139 +133 @@
       if (arcs.Contains(arc)) return;
       arcs.Add(arc);
-      arc.Changed += OnArcChanged;
     }
 
@@ -146 +139 @@
       if (!arcs.Contains(arc)) return; // the same rationale as above 
       arcs.Remove(arc);
-      arc.Changed -= OnArcChanged;
     }
-
-    protected virtual void OnArcChanged(object sender, EventArgs args) { }
 
     public override Image ItemImage {
       get { return Common.Resources.VSImageLibrary.Graph; }
     }
+
+    // events
+    public event EventHandler VertexAdded;
+    public event EventHandler VertexRemoved;
+    public event EventHandler ArcAdded;
+    public event EventHandler ArcRemoved;
   }
 }

branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/DirectedGraph/Interfaces/IDirectedGraph.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
 using HeuristicLab.Core;
@@ -33 +34 @@
     IEnumerable<IVertex> Vertices { get; }
     IEnumerable<IArc> Arcs { get; }
+
+    event EventHandler VertexAdded;
+    event EventHandler VertexRemoved;
+    event EventHandler ArcAdded;
+    event EventHandler ArcRemoved;
   }
 }

branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/DirectedGraph/Interfaces/IVertex.cs

@@ -45 +45 @@
     void AddArc(IArc arc);
     void RemoveArc(IArc arc);
-    void RemoveArc(IVertex vertex);
   }
 

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

@@ -30 +30 @@
   [StorableClass]
   public class Vertex : Item, IVertex {
-    // 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<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;
@@ -57 +35 @@
       get { return label; }
       set {
+        if (label.Equals(value)) return;
         label = value;
         OnChanged(this, EventArgs.Empty);
@@ -67 +46 @@
       get { return weight; }
       set {
+        if (weight.Equals(value)) return;
         weight = value;
         OnChanged(this, EventArgs.Empty);
@@ -77 +57 @@
       get { return content; }
       set {
+        if (content == value) return;
         content = value;
         OnChanged(this, EventArgs.Empty);
@@ -92 +73 @@
     }
 
+    public int InDegree { get { return InArcs.Count(); } }
+    public int OutDegree { get { return OutArcs.Count(); } }
+    public int Degree { get { return InDegree + OutDegree; } }
+
     [StorableConstructor]
     public Vertex(bool deserializing) : base(deserializing) { }
@@ -98 +83 @@
     private void AfterDeserialization() { }
 
-    private Vertex() { }
-
-    public Vertex(object content)
-      : this() {
+    public Vertex(object content) {
       this.content = content;
     }
@@ -126 +108 @@
         if (outArcs == null)
           outArcs = new List<IArc>();
-        else if (outArcs.Contains(arc) || outArcs.Any(a => a.Target == arc.Target))
+        else if (outArcs.Contains(arc))
           throw new InvalidOperationException("Arc already added.");
         outArcs.Add(arc);
@@ -132 +114 @@
         if (inArcs == null)
           inArcs = new List<IArc>();
-        else if (inArcs.Contains(arc) || inArcs.Any(a => a.Source == arc.Source))
+        else if (inArcs.Contains(arc))
           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");
-      }
     }
 
@@ -163 +135 @@
     }
 
-    public int InDegree { get { return InArcs.Count(); } }
-    public int OutDegree { get { return OutArcs.Count(); } }
-    public int Degree { get { return InDegree + OutDegree; } }
+    #region events
+    // 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<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);
+    }
+    #endregion
   }