Changeset 11241 for trunk/sources

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

Files:

• Collections/DirectedGraph (added)
• Collections/DirectedGraph/Arc.cs (copied) (copied from branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/DirectedGraph/Arc.cs) (3 diffs)
• Collections/DirectedGraph/DirectedGraph.cs (copied) (copied from branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/DirectedGraph/DirectedGraph.cs) (9 diffs)
• Collections/DirectedGraph/Vertex.cs (copied) (copied from branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/DirectedGraph/Vertex.cs) (7 diffs)
• HeuristicLab.Core-3.3.csproj (modified) (2 diffs)
• Interfaces/DirectedGraph (added)
• Interfaces/DirectedGraph/IArc.cs (copied) (copied from branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/DirectedGraph/Interfaces/IArc.cs) (1 diff)
• Interfaces/DirectedGraph/IDirectedGraph.cs (copied) (copied from branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/DirectedGraph/Interfaces/IDirectedGraph.cs) (2 diffs)
• Interfaces/DirectedGraph/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/Collections/DirectedGraph/Arc.cs

@@ -22 +22 @@
 using System;
 using HeuristicLab.Common;
-using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
+namespace HeuristicLab.Core {
   /// <summary>
   /// An arc that can have a weight, a label, and a data object for holding additional info
@@ -60 +59 @@
 
     [Storable]
-    protected object data;
-    public object Data {
+    protected IDeepCloneable data;
+    public IDeepCloneable Data {
       get { return data; }
       set {
@@ -84 +83 @@
       label = original.Label;
       weight = original.Weight;
-      data = original;
+      data = cloner.Clone(data);
     }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new Arc(this, cloner);
-    }
+    public override IDeepCloneable Clone(Cloner cloner) { return new Arc(this, cloner); }
 
     public event EventHandler Changed;

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;
   }
 }

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

@@ -24 +24 @@
 using System.Linq;
 using HeuristicLab.Common;
-using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
+namespace HeuristicLab.Core {
   [StorableClass]
   public class Vertex : Item, IVertex {
     [Storable]
-    protected string label;
+    private string label;
     public string Label {
       get { return label; }
@@ -42 +41 @@
 
     [Storable]
-    protected double weight;
+    private double weight;
     public double Weight {
       get { return weight; }
@@ -53 +52 @@
 
     [Storable]
-    protected object content;
-    public object Content {
-      get { return content; }
+    private IDeepCloneable data;
+    public IDeepCloneable Data {
+      get { return data; }
       set {
-        if (content == value) return;
-        content = value;
+        if (data == value) return;
+        data = value;
         OnChanged(this, EventArgs.Empty);
       }
     }
 
-    private List<IArc> inArcs;
+    private readonly List<IArc> inArcs = new List<IArc>();
     public IEnumerable<IArc> InArcs {
-      get { return inArcs ?? Enumerable.Empty<IArc>(); }
+      get { return inArcs; }
     }
 
-    private List<IArc> outArcs;
+    private readonly List<IArc> outArcs = new List<IArc>();
     public IEnumerable<IArc> OutArcs {
-      get { return outArcs ?? Enumerable.Empty<IArc>(); }
+      get { return outArcs; }
     }
 
@@ -83 +82 @@
     private void AfterDeserialization() { }
 
-    public Vertex(object content) {
-      this.content = content;
+    public Vertex(IDeepCloneable data) {
+      this.data = data;
     }
 
     protected Vertex(Vertex original, Cloner cloner)
       : base(original, cloner) {
-      content = original.content;
+      data = cloner.Clone(original.Data);
       label = original.Label;
       weight = original.Weight;
@@ -106 +105 @@
 
       if (this == arc.Source) {
-        if (outArcs == null)
-          outArcs = new List<IArc>();
-        else if (outArcs.Contains(arc))
-          throw new InvalidOperationException("Arc already added.");
+        if (outArcs.Contains(arc)) throw new InvalidOperationException("Arc already added.");
         outArcs.Add(arc);
-      } else if (this == arc.Target) {
-        if (inArcs == null)
-          inArcs = new List<IArc>();
-        else if (inArcs.Contains(arc))
-          throw new InvalidOperationException("Arc already added.");
+      }
+      if (this == arc.Target) {
+        if (inArcs.Contains(arc)) throw new InvalidOperationException("Arc already added.");
         inArcs.Add(arc);
       }
@@ -125 +119 @@
         throw new InvalidOperationException("The current vertex must be either the arc source or the arc target.");
 
-      if (this == arc.Source && outArcs != null) {
-        if (!outArcs.Remove(arc))
-          throw new InvalidOperationException("Arc is not present in this vertex' outgoing arcs.");
-      } else if (this == arc.Target && inArcs != null) {
-        if (!inArcs.Remove(arc))
-          throw new InvalidOperationException("Arc is not present in this vertex' incoming arcs.");
+      if (this == arc.Source) {
+        if (!outArcs.Remove(arc)) throw new InvalidOperationException("Arc is not present in this vertex' outgoing arcs.");
+      }
+      if (this == arc.Target) {
+        if (!inArcs.Remove(arc)) throw new InvalidOperationException("Arc is not present in this vertex' incoming arcs.");
       }
       OnArcRemoved(this, new EventArgs<IArc>(arc));
@@ -162 +155 @@
   [StorableClass]
   public class Vertex<T> : Vertex, IVertex<T> where T : class,IItem {
-    public new T Content {
-      get { return (T)base.Content; }
-      set { base.Content = value; }
+    public new T Data {
+      get { return (T)base.Data; }
+      set { base.Data = value; }
     }
 

trunk/sources/HeuristicLab.Core/3.3/HeuristicLab.Core-3.3.csproj

@@ -116 +116 @@
     <Compile Include="Collections\CheckedItemCollection.cs" />
     <Compile Include="Collections\CheckedItemList.cs" />
+    <Compile Include="Collections\DirectedGraph\Arc.cs" />
+    <Compile Include="Collections\DirectedGraph\DirectedGraph.cs" />
+    <Compile Include="Collections\DirectedGraph\Vertex.cs" />
     <Compile Include="Collections\ReadOnlyCheckedItemCollection.cs" />
     <Compile Include="Collections\ReadOnlyCheckedItemList.cs">
@@ -148 +151 @@
     <Compile Include="Constraints\IConstraint.cs" />
     <Compile Include="Constraints\TypeCompatibilityConstraint.cs" />
+    <Compile Include="Interfaces\DirectedGraph\IArc.cs" />
+    <Compile Include="Interfaces\DirectedGraph\IDirectedGraph.cs" />
+    <Compile Include="Interfaces\DirectedGraph\IVertex.cs" />
     <Compile Include="Interfaces\ICheckedMultiOperator.cs" />
     <Compile Include="Interfaces\IConstrainedValueParameter.cs" />

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; }
   }
 }