Changeset 10897 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/DirectedGraph/Vertex.cs

Timestamp:

05/27/14 16:33:17 (10 years ago)

Author:

bburlacu

Message:

#1772: Adjusted namespace in Plugin.cs.frame for HeuristicLab.EvolutionTracking.Views. Simplified DirectedGraph and GenealogyGraph API. Added public events for the Vertex content (so that the graph itself can be notified when the content changes and can adjust it's content-to-vertex map. Adjusted instrumented operators code to reflect api changes.

File:

• branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/DirectedGraph/Vertex.cs (modified) (6 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/DirectedGraph/Vertex.cs

@@ -30 +30 @@
   [StorableClass]
   public class Vertex : Item, IVertex {
+    public event EventHandler PreContentChanged;
+    protected virtual void OnPreContentChanged(object sender, EventArgs args) {
+      var changed = PreContentChanged;
+      if (changed != null) {
+        changed(sender, args);
+      }
+    }
+
+    public event EventHandler PostContentChanged;
+    protected virtual void OnPostContentChanged(object sender, EventArgs args) {
+      var changed = PostContentChanged;
+      if (changed != null) {
+        changed(sender, args);
+      }
+    }
+
     [Storable]
     private string id;
+
     public string Id {
       get { return id; }
-      set { id = value; }
     }
+
     [Storable]
-    private string label;
-    public string Label { get { return label; } set { label = value; } }
+    public string Label { get; set; }
+
     [Storable]
-    private double weight;
-    public double Weight { get { return weight; } set { weight = value; } }
+    public double Weight { get; set; }
+
+    [Storable]
+    protected object content;
+    public object Content {
+      get { return content; }
+      set {
+        OnPreContentChanged(this, EventArgs.Empty);
+        content = value;
+        OnPostContentChanged(this, EventArgs.Empty);
+      }
+    }
+
     [Storable]
     private List<IArc> inArcs;
@@ -48 +76 @@
       set { inArcs = value.ToList(); }
     }
+
     [Storable]
     private List<IArc> outArcs;
@@ -54 +83 @@
       set { outArcs = value.ToList(); }
     }
-    [Storable]
-    public object Content { get; set; }
 
     [StorableConstructor]
@@ -64 +91 @@
     }
 
+    public Vertex(object content)
+      : this() {
+      this.content = content;
+    }
+
     protected Vertex(Vertex original, Cloner cloner)
       : base(original, cloner) {
-      Id = Guid.NewGuid().ToString();
+      id = Guid.NewGuid().ToString();
+      content = original.content;
       Label = original.Label;
+      Weight = original.Weight;
       inArcs = new List<IArc>(original.inArcs);
       outArcs = new List<IArc>(original.outArcs);
@@ -79 +113 @@
     protected void AfterDeserialization() {
       if (Id == null) {
-        Id = Guid.NewGuid().ToString();
+        id = Guid.NewGuid().ToString();
       }
     }
@@ -117 +151 @@
     protected Vertex(Vertex<T> original, Cloner cloner)
       : base(original, cloner) {
-      Content = original.Content; // not sure if to Clone()
     }