Changeset 11935 for stable/HeuristicLab.Core/3.3/Interfaces

Timestamp:

02/06/15 11:59:12 (10 years ago)

Author:

jkarder

Message:

#2223: merged r11241, r11243, r11248, r11249, r11250, r11251, r11256, r11263, r11324, r11389, r11391, r11444, r11853, r11879, r11912 and r11913 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Core/3.3/Interfaces/DirectedGraph (copied) (copied from trunk/sources/HeuristicLab.Core/3.3/Interfaces/DirectedGraph)
• HeuristicLab.Core/3.3/Interfaces/DirectedGraph/IArc.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/DirectedGraph/IDirectedGraph.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Interfaces/DirectedGraph/IVertex.cs (modified) (2 diffs)

stable/HeuristicLab.Core/3.3/Interfaces/DirectedGraph/IArc.cs

@@ -29 +29 @@
     string Label { get; set; }
     double Weight { get; set; }
-    IDeepCloneable Data { get; set; }
 
     event EventHandler Changed; // generic event for when the label, weight or data were changed
   }
 
-  public interface IArc<T> : IArc where T : class,IItem {
-    new IVertex<T> Source { get; }
-    new IVertex<T> Target { get; }
+  public interface IArc<T> : IArc where T : class,IDeepCloneable {
+    T Data { get; set; }
   }
 }

stable/HeuristicLab.Core/3.3/Interfaces/DirectedGraph/IDirectedGraph.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Core {
   public interface IDirectedGraph : IItem {
-    void Clear();
-    void AddVertex(IVertex vertex);
-    IArc AddArc(IVertex source, IVertex target);
-    void AddArc(IArc arc);
-    void RemoveVertex(IVertex vertex);
-    void RemoveArc(IArc arc);
     IEnumerable<IVertex> Vertices { get; }
     IEnumerable<IArc> Arcs { get; }
 
-    event EventHandler VertexAdded;
-    event EventHandler VertexRemoved;
-    event EventHandler ArcAdded;
-    event EventHandler ArcRemoved;
+    void Clear();
+    void AddVertex(IVertex vertex);
+    void RemoveVertex(IVertex vertex);
+
+    void AddVertices(IEnumerable<IVertex> vertexList);
+    void RemoveVertices(IEnumerable<IVertex> vertexList);
+
+    IArc AddArc(IVertex source, IVertex target);
+    void AddArc(IArc arc);
+    void RemoveArc(IArc arc);
+
+    void AddArcs(IEnumerable<IArc> arcs);
+    void RemoveArcs(IEnumerable<IArc> removeArcs);
+
+    event EventHandler<EventArgs<IVertex>> VertexAdded;
+    event EventHandler<EventArgs<IVertex>> VertexRemoved;
+    event EventHandler<EventArgs<IArc>> ArcAdded;
+    event EventHandler<EventArgs<IArc>> ArcRemoved;
   }
 }

stable/HeuristicLab.Core/3.3/Interfaces/DirectedGraph/IVertex.cs

@@ -36 +36 @@
     double Weight { get; set; }
 
-    IDeepCloneable Data { get; set; }
-
     void AddArc(IArc arc);
     void RemoveArc(IArc arc);
@@ -46 +44 @@
   }
 
-  public interface IVertex<T> : IVertex
-  where T : class {
-    new T Data { get; set; }
+  public interface IVertex<T> : IVertex where T : class, IDeepCloneable {
+    T Data { get; set; }
   }
 }