Changeset 11241 for trunk/sources/HeuristicLab.Core/3.3/Interfaces

Timestamp:

07/30/14 15:02:27 (11 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/Interfaces/DirectedGraph

Files:

• . (added)
• IArc.cs (copied) (copied from branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/DirectedGraph/Interfaces/IArc.cs) (1 diff)
• IDirectedGraph.cs (copied) (copied from branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/DirectedGraph/Interfaces/IDirectedGraph.cs) (2 diffs)
• IVertex.cs (copied) (copied from branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/DirectedGraph/Interfaces/IVertex.cs) (3 diffs)

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

@@ -21 +21 @@
 
 using System;
-using HeuristicLab.Core;
+using HeuristicLab.Common;
 
-namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
+namespace HeuristicLab.Core {
   public interface IArc : IItem {
-    event EventHandler Changed; // generic event for when the label, weight or data were changed
     IVertex Source { get; }
     IVertex Target { get; }
     string Label { get; set; }
     double Weight { get; set; }
-    object Data { get; set; }
+    IDeepCloneable Data { get; set; }
+
+    event EventHandler Changed; // generic event for when the label, weight or data were changed
   }
 

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using HeuristicLab.Core;
 
-namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
+namespace HeuristicLab.Core {
   public interface IDirectedGraph : IItem {
     void Clear();

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

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -23 +23 @@
 using System.Collections.Generic;
 using HeuristicLab.Common;
-using HeuristicLab.Core;
 
-namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
+namespace HeuristicLab.Core {
   public interface IVertex : IItem {
-    event EventHandler Changed; // generic event for when the content, label or weight have changed
-    event EventHandler<EventArgs<IArc>> ArcAdded;
-    event EventHandler<EventArgs<IArc>> ArcRemoved;
-
     IEnumerable<IArc> InArcs { get; }
     IEnumerable<IArc> OutArcs { get; }
@@ -41 +36 @@
     double Weight { get; set; }
 
-    object Content { get; set; }
+    IDeepCloneable Data { get; set; }
 
     void AddArc(IArc arc);
     void RemoveArc(IArc arc);
+
+    event EventHandler Changed; // generic event for when the content, label or weight have changed
+    event EventHandler<EventArgs<IArc>> ArcAdded;
+    event EventHandler<EventArgs<IArc>> ArcRemoved;
   }
 
   public interface IVertex<T> : IVertex
   where T : class {
-    new T Content { get; set; }
+    new T Data { get; set; }
   }
 }