Changeset 11249 for trunk/sources/HeuristicLab.Core/3.3/Collections

Timestamp:

07/31/14 10:03:24 (10 years ago)

Author:

mkommend

Message:

#2223: Minor code changes in DirectedGraph (renaming of methods, code simplification).

File:

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

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

@@ -71 +71 @@
     private void AfterDeserialization() {
       foreach (var vertex in vertices) {
-        vertex.ArcAdded += OnVertexArcAdded;
-        vertex.ArcRemoved += OnVertexArcRemoved;
+        vertex.ArcAdded += Vertex_ArcAdded;
+        vertex.ArcRemoved += Vertex_ArcRemoved;
       }
 
@@ -91 +91 @@
       vertices.Add(vertex);
       // register event handlers
-      vertex.ArcAdded += OnVertexArcAdded;
-      vertex.ArcRemoved += OnVertexArcRemoved;
-      OnVertedAdded(this, EventArgs.Empty);
+      vertex.ArcAdded += Vertex_ArcAdded;
+      vertex.ArcRemoved += Vertex_ArcRemoved;
+      OnVertedAdded(this, new EventArgs<IVertex>(vertex));
     }
 
@@ -103 +103 @@
         RemoveArc(arc);
       // deregister event handlers
-      vertex.ArcAdded -= OnVertexArcAdded;
-      vertex.ArcRemoved -= OnVertexArcRemoved;
-      OnVertexRemoved(this, EventArgs.Empty); // do not pass the removed vertex in the event as we don't need it anymore
+      vertex.ArcAdded -= Vertex_ArcAdded;
+      vertex.ArcRemoved -= Vertex_ArcRemoved;
+      OnVertexRemoved(this, new EventArgs<IVertex>(vertex));
     }
 
@@ -120 +120 @@
       target.AddArc(arc);
       arcs.Add(arc);
-      OnArcAdded(this, EventArgs.Empty);
     }
 
@@ -129 +128 @@
       source.RemoveArc(arc);
       target.RemoveArc(arc);
-      OnArcRemoved(this, EventArgs.Empty);
     }
 
-    protected virtual void OnVertexArcAdded(object sender, EventArgs<IArc> args) {
+    protected virtual void Vertex_ArcAdded(object sender, EventArgs<IArc> args) {
+      // the ArcAdded event is fired by a vertex when an arc from/to another vertex is added to its list of connections
+      // because the arc is added in both directions by both the source and the target, this event will get fired twice here
       var arc = args.Value;
-      // the ArcAdded event is fired by a vertex when an arc from/to another vertex is added to its list of connections
-      // because the arc is added in both directions by both the source and the target, this event will get fired twice 
-      // here, we only want to add the arc once, so if its already contained, we return without complaining
-      if (arcs.Contains(arc)) return;
-      arcs.Add(arc);
+      if (arcs.Add(arc)) OnArcAdded(this, new EventArgs<IArc>(arc));
     }
 
-    protected virtual void OnVertexArcRemoved(object sender, EventArgs<IArc> args) {
+    protected virtual void Vertex_ArcRemoved(object sender, EventArgs<IArc> args) {
       var arc = args.Value;
-      if (!arcs.Contains(arc)) return; // the same rationale as above 
-      arcs.Remove(arc);
+      if (arcs.Remove(arc)) OnArcRemoved(this, new EventArgs<IArc>(arc));
     }
 
     // events
     public event EventHandler VertexAdded;
-    protected virtual void OnVertedAdded(object sender, EventArgs args) {
+    protected virtual void OnVertedAdded(object sender, EventArgs<IVertex> args) {
       var added = VertexAdded;
       if (added != null)
@@ -156 +151 @@
 
     public event EventHandler VertexRemoved;
-    protected virtual void OnVertexRemoved(object sender, EventArgs args) {
+    protected virtual void OnVertexRemoved(object sender, EventArgs<IVertex> args) {
       var removed = VertexRemoved;
       if (removed != null)
@@ -163 +158 @@
 
     public event EventHandler ArcAdded;
-    protected virtual void OnArcAdded(object sender, EventArgs args) {
+    protected virtual void OnArcAdded(object sender, EventArgs<IArc> args) {
       var added = ArcAdded;
       if (added != null)
@@ -170 +165 @@
 
     public event EventHandler ArcRemoved;
-    protected virtual void OnArcRemoved(object sender, EventArgs args) {
+    protected virtual void OnArcRemoved(object sender, EventArgs<IArc> args) {
       var removed = ArcRemoved;
       if (removed != null)