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

Timestamp:

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

Author:

bburlacu

Message:

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

File:

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

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;
   }
 }