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

Timestamp:

02/05/15 13:55:04 (10 years ago)

Author:

bburlacu

Message:

#2223: Moved Data member to the generic versions of Vertex and Arc (restricted to be an IDeepCloneable). Fixed AddVertices method and added complementary AddArcs and RemoveArcs methods.

File:

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

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

@@ -102 +102 @@
         vertex.ArcAdded += Vertex_ArcAdded;
         vertex.ArcRemoved += Vertex_ArcRemoved;
-        OnVertedAdded(this, new EventArgs<IVertex>(vertex));
+        OnVertexAdded(this, new EventArgs<IVertex>(vertex));
       }
     }
 
     public virtual void AddVertices(IEnumerable<IVertex> vertexList) {
-      var hash = new HashSet<IVertex>(vertexList);
-      var arcList = vertexList.SelectMany(v => v.InArcs.Concat(v.OutArcs));
-      if (arcList.Any(x => !hash.Contains(x.Source) || !hash.Contains(x.Target)))
-        throw new ArgumentException("Vertex arcs are connected to vertices not in the graph.");
-      // if everything is in order, add the vertices to the directed graph
-      foreach (var v in vertexList)
-        vertices.Add(v);
-      foreach (var a in arcList)
-        arcs.Add(a);
+      foreach (var v in vertexList) { AddVertex(v); }
     }
 
     public virtual void RemoveVertices(IEnumerable<IVertex> vertexList) {
-      foreach (var v in vertexList)
-        RemoveVertex(v);
+      foreach (var v in vertexList) { RemoveVertex(v); }
     }
 
@@ -156 +147 @@
     }
 
+    public virtual void AddArcs(IEnumerable<IArc> arcList) {
+      foreach (var a in arcList) { AddArc(a); }
+    }
+
     public virtual void RemoveArc(IArc arc) {
       arcs.Remove(arc);
@@ -164 +159 @@
     }
 
+    public virtual void RemoveArcs(IEnumerable<IArc> arcList) {
+      foreach (var a in arcList) { RemoveArc(a); }
+    }
+
     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
@@ -178 +177 @@
     // events
     public event EventHandler<EventArgs<IVertex>> VertexAdded;
-    protected virtual void OnVertedAdded(object sender, EventArgs<IVertex> args) {
+    protected virtual void OnVertexAdded(object sender, EventArgs<IVertex> args) {
       var added = VertexAdded;
       if (added != null)