Changeset 11913

Timestamp:

02/05/15 13:56:26 (10 years ago)

Author:

bburlacu

Message:

#2223: Forgot to commit interfaces.

Location:

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

Files:

• IArc.cs (modified) (2 diffs)
• IDirectedGraph.cs (modified) (1 diff)
• IVertex.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Core/3.3/Interfaces/DirectedGraph/IArc.cs

@@ -21 +21 @@
 
 using System;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Core {
@@ -28 +29 @@
     string Label { get; set; }
     double Weight { get; set; }
-    object 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; }
   }
 }

trunk/sources/HeuristicLab.Core/3.3/Interfaces/DirectedGraph/IDirectedGraph.cs

@@ -26 +26 @@
 namespace HeuristicLab.Core {
   public interface IDirectedGraph : IItem {
+    IEnumerable<IVertex> Vertices { get; }
+    IEnumerable<IArc> Arcs { get; }
+
     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 RemoveVertices(IEnumerable<IVertex> vertexList);
-    void RemoveVertex(IVertex vertex);
     void RemoveArc(IArc arc);
-    IEnumerable<IVertex> Vertices { get; }
-    IEnumerable<IArc> Arcs { get; }
+
+    void AddArcs(IEnumerable<IArc> arcs);
+    void RemoveArcs(IEnumerable<IArc> removeArcs);
 
     event EventHandler<EventArgs<IVertex>> VertexAdded;

trunk/sources/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; }
   }
 }