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

Timestamp:

07/30/14 15:02:27 (10 years ago)

Author:

mkommend

Message:

#2223: Copied directed graph implented in bottom up tree distance branch into the trunk.

Location:

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

Files:

• . (added)
• DirectedGraph.cs (copied) (copied from branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/DirectedGraph/DirectedGraph.cs) (9 diffs)

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

@@ -25 +25 @@
 using System.Linq;
 using HeuristicLab.Common;
-using HeuristicLab.Core;
+using HeuristicLab.Common.Resources;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
+namespace HeuristicLab.Core {
   [Item("DirectedGraph", "Generic class representing a directed graph with custom vertices and content")]
   [StorableClass]
   public class DirectedGraph : Item, IDirectedGraph {
-    protected HashSet<IVertex> vertices;
+    public override Image ItemImage { get { return VSImageLibrary.Graph; } }
+
+    private HashSet<IVertex> vertices;
     [Storable]
     public IEnumerable<IVertex> Vertices {
@@ -39 +41 @@
     }
 
-    protected HashSet<IArc> arcs;
+    private HashSet<IArc> arcs;
     [Storable]
     public IEnumerable<IArc> Arcs {
       get { return arcs; }
       private set { arcs = new HashSet<IArc>(value); }
+    }
+
+    public DirectedGraph() {
+      vertices = new HashSet<IVertex>();
+      arcs = new HashSet<IArc>();
+    }
+
+    protected DirectedGraph(DirectedGraph original, Cloner cloner)
+      : base(original, cloner) {
+      vertices = new HashSet<IVertex>(original.vertices.Select(cloner.Clone));
+      arcs = new HashSet<IArc>(original.arcs.Select(cloner.Clone));
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new DirectedGraph(this, cloner);
     }
 
@@ -64 +81 @@
         target.AddArc(arc);
       }
-    }
-
-    public DirectedGraph() {
-      vertices = new HashSet<IVertex>();
-      arcs = new HashSet<IArc>();
-    }
-
-    protected DirectedGraph(DirectedGraph original, Cloner cloner)
-      : base(original, cloner) {
-      vertices = new HashSet<IVertex>(original.vertices.Select(cloner.Clone));
-      arcs = new HashSet<IArc>(original.arcs.Select(cloner.Clone));
-    }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new DirectedGraph(this, cloner);
     }
 
@@ -104 +106 @@
     }
 
-    public IArc AddArc(IVertex source, IVertex target) {
+    public virtual IArc AddArc(IVertex source, IVertex target) {
       var arc = new Arc(source, target);
       AddArc(arc);
@@ -110 +112 @@
     }
 
-    public void AddArc(IArc arc) {
+    public virtual void AddArc(IArc arc) {
       var source = (Vertex)arc.Source;
       var target = (Vertex)arc.Target;
@@ -118 +120 @@
     }
 
-    public void RemoveArc(IArc arc) {
+    public virtual void RemoveArc(IArc arc) {
       arcs.Remove(arc);
       var source = (Vertex)arc.Source;
@@ -126 +128 @@
     }
 
+    public event EventHandler ArcAdded;
     protected virtual void OnArcAdded(object sender, EventArgs<IArc> args) {
       var arc = args.Value;
@@ -135 +138 @@
     }
 
+
+    public event EventHandler ArcRemoved;
     protected virtual void OnArcRemoved(object sender, EventArgs<IArc> args) {
       var arc = args.Value;
@@ -141 +146 @@
     }
 
-    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;
   }
 }