Changeset 11263 for trunk

Timestamp:

08/04/14 14:58:47 (10 years ago)

Author:

bburlacu

Message:

#2223:

• Vertex: remove cloning of arcs in the cloning constructor
• DirectedGraph; Adjust cloning constructor to add arcs to cloned vertices

Location:

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

Files:

• DirectedGraph.cs (modified) (2 diffs)
• Vertex.cs (modified) (4 diffs)

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

@@ -57 +57 @@
       vertices = new HashSet<IVertex>(original.vertices.Select(cloner.Clone));
       arcs = new HashSet<IArc>(original.arcs.Select(cloner.Clone));
+
+      // add the arcs to the newly cloned vertices
+      foreach (var arc in arcs) {
+        arc.Source.AddArc(arc);
+        arc.Target.AddArc(arc);
+      }
     }
 
@@ -89 +95 @@
 
     public virtual void AddVertex(IVertex vertex) {
-      vertices.Add(vertex);
-      // register event handlers
-      vertex.ArcAdded += Vertex_ArcAdded;
-      vertex.ArcRemoved += Vertex_ArcRemoved;
-      OnVertedAdded(this, new EventArgs<IVertex>(vertex));
+      if (!vertices.Contains(vertex) && vertex.Degree > 0)
+        throw new ArgumentException("New vertices cannot have any arcs.");
+
+      if (vertices.Add(vertex)) {
+        // register event handlers
+        vertex.ArcAdded += Vertex_ArcAdded;
+        vertex.ArcRemoved += Vertex_ArcRemoved;
+        OnVertedAdded(this, new EventArgs<IVertex>(vertex));
+      }
     }
 

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

@@ -93 +93 @@
       weight = original.Weight;
 
-      inArcs = original.InArcs.Select(cloner.Clone).ToList();
-      outArcs = original.OutArcs.Select(cloner.Clone).ToList();
+      // we do not clone the arcs here (would cause too much recursion and ultimately a stack overflow)
     }
 
@@ -103 +102 @@
     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.");
+        throw new ArgumentException("The current vertex must be either the arc source or the arc target.");
+
+      if (arc.Source == arc.Target)
+        throw new ArgumentException("Arc source and target must be different.");
 
       if (this == arc.Source) {
@@ -118 +120 @@
     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.");
+        throw new ArgumentException("The current vertex must be either the arc source or the arc target.");
 
       if (this == arc.Source) {
@@ -168 +170 @@
     }
 
+    public Vertex(IDeepCloneable data)
+      : base(data) {
+    }
+
     public override IDeepCloneable Clone(Cloner cloner) {
       return new Vertex<T>(this, cloner);