Changeset 11229 for branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/DirectedGraph/Arc.cs

Timestamp:

07/29/14 16:20:08 (10 years ago)

Author:

bburlacu

Message:

#2215: Refactored and simplified DirectedGraph and related components API, simplified the BottomUpSimilarityCalculator by not using a directed graph and vertices but a simpler object so that the similarity calculator is self-contained.

File:

• branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/DirectedGraph/Arc.cs (modified) (3 diffs)

branches/HeuristicLab.BottomUpTreeDistance/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/DirectedGraph/Arc.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -26 +27 @@
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   /// <summary>
-  /// An arc that can have a weight, a label, and can old additional information in the Data object
+  /// An arc that can have a weight, a label, and a data object for holding additional info
   /// </summary>
   [StorableClass]
   public class Arc : Item, IArc {
-    [Storable]
-    public IVertex Source { get; set; }
+    public event EventHandler Changed;
+    protected virtual void OnChanged(object sender, EventArgs args) {
+      var changed = Changed;
+      if (changed != null)
+        changed(sender, args);
+    }
 
     [Storable]
-    public IVertex Target { get; set; }
+    public IVertex Source { get; private set; }
 
     [Storable]
-    public string Label { get; set; }
+    public IVertex Target { get; private set; }
 
     [Storable]
-    public double Weight { get; set; }
+    protected string label;
+    public string Label {
+      get { return label; }
+      set {
+        label = value;
+        OnChanged(this, EventArgs.Empty);
+      }
+    }
 
     [Storable]
-    public object Data { get; set; }
+    protected double weight;
+    public double Weight {
+      get { return weight; }
+      set {
+        weight = value;
+        OnChanged(this, EventArgs.Empty);
+      }
+    }
+
+    [Storable]
+    protected object data;
+    public object Data {
+      get { return data; }
+      set {
+        data = value;
+        OnChanged(this, EventArgs.Empty);
+      }
+    }
 
     [StorableConstructor]
     public Arc(bool deserializing) : base(deserializing) { }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new Arc(this, cloner);
-    }
-    public Arc() { }
 
     public Arc(IVertex source, IVertex target) {
@@ -60 +84 @@
     protected Arc(Arc original, Cloner cloner)
       : base(original, cloner) {
-      Source = original.Source;
-      Target = original.Target;
-      Label = original.Label;
-      Weight = original.Weight;
-      Data = original.Data;
+      Source = cloner.Clone(original.Source);
+      Target = cloner.Clone(original.Target);
+      label = original.Label;
+      weight = original.Weight;
+      data = original;
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new Arc(this, cloner);
+    }
+  }
+
+  [StorableClass]
+  public class Arc<T> : Arc, IArc<T> where T : class,IItem {
+    public Arc(bool deserializing)
+      : base(deserializing) {
+    }
+
+    public Arc(IVertex source, IVertex target)
+      : base(source, target) {
+    }
+
+    protected Arc(Arc original, Cloner cloner)
+      : base(original, cloner) {
+    }
+
+    new public IVertex<T> Source {
+      get { return (IVertex<T>)base.Source; }
+    }
+    new public IVertex<T> Target {
+      get { return (IVertex<T>)base.Target; }
     }
   }