Context Navigation

HeuristicLab.EvolutionTracking

Timestamp:

02/05/15 19:35:34 (9 years ago)

Author:

bburlacu

Message:

#1772:

Location:

Files:

-                      r11852
+                      r11925
     private Dictionary<string, IGenealogyGraphNode> idMap;
     private readonly Comparison<IArc> compareArcs = (a, b) => {
+    private readonly Comparison<IArc<IDeepCloneable>> compareArcs = (a, b) => {
       if (a.Data == b.Data)
         return 0;
 …
       RebuildDictionaries();
       foreach (var arcs in Vertices.Select(v => (List<IArc>)((IVertex)v).InArcs)) { arcs.Sort(compareArcs); }
+      foreach (var arcs in Vertices.Select(v => v.InArcs.ToList())) { arcs.Sort(compareArcs); }
+    }
     public override IDeepCloneable Clone(Cloner cloner) {
 …
     private void AfterDeserialization() {
       RebuildDictionaries();
       foreach (var arcs in Vertices.Select(v => (List<IArc>)((Vertex)v).InArcs)) { arcs.Sort(compareArcs); }
+      foreach (var arcs in Vertices.Select(v => v.InArcs.ToList())) { arcs.Sort(compareArcs); }
+    }
     public GenealogyGraph() {
 …
       return ColorGradient.Colors[colorIndex];
+    }
-    public override void AddVertices(IEnumerable<IVertex> vertexList) {
-      base.AddVertices(vertexList);
-      RebuildDictionaries();
+    }
+  }

-                      r11502
+                      r11925
   [StorableClass]
   [Item("GenealogyGraphArc", "A graph arc connecting two GenealogyGraphNodes and holding some data.")]
   public class GenealogyGraphArc : Arc, IGenealogyGraphArc {
+  public class GenealogyGraphArc : Arc<IDeepCloneable>, IGenealogyGraphArc {
     [StorableConstructor]
     protected GenealogyGraphArc(bool deserializing) : base(deserializing) { }
 …
     [StorableConstructor]
     protected GenealogyGraphArc(bool deserializing) : base(deserializing) { }
     protected GenealogyGraphArc(GenealogyGraphArc original, Cloner cloner)
       : base(original, cloner) {
 …
       return new GenealogyGraphArc<T>(this, cloner);
+    }
     public new T Data {
       get { return (T)base.Data; }

-                      r11858
+                      r11925
   [StorableClass]
   [Item("GenealogGraphNode", "A class representing a node in the GenealogyGraph")]
   public class GenealogyGraphNode : Vertex, IGenealogyGraphNode {
+  public class GenealogyGraphNode : Vertex<IDeepCloneable>, IGenealogyGraphNode {
     [StorableConstructor]
     protected GenealogyGraphNode(bool deserializing) : base(deserializing) { }
 …
+    }
+    public GenealogyGraphNode() {
+      Id = Guid.NewGuid().ToString();
+    }
     public GenealogyGraphNode(IDeepCloneable data)
       : base(data) {
       Id = Guid.NewGuid().ToString();
+      : this() {
+      Data = data;
+    }

-                      r11253
+                      r11925
 #endregion
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 namespace HeuristicLab.EvolutionTracking {
   public interface IGenealogyGraphArc : IArc {
+  public interface IGenealogyGraphArc : IArc<IDeepCloneable> {
     new IGenealogyGraphNode Source { get; }
     new IGenealogyGraphNode Target { get; }

-                      r11253
+                      r11925
 using System;
 using System.Collections.Generic;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 namespace HeuristicLab.EvolutionTracking {
   public interface IGenealogyGraphNode : IVertex, IComparable<IGenealogyGraphNode> {
+  public interface IGenealogyGraphNode : IVertex<IDeepCloneable>, IComparable<IGenealogyGraphNode> {
     double Rank { get; set; }
     double Quality { get; set; }
 …
+  }
   public interface IGenealogyGraphNode<T> : IGenealogyGraphNode, IVertex<T> where T : class {
+  public interface IGenealogyGraphNode<T> : IGenealogyGraphNode where T : class {
     new IEnumerable<IGenealogyGraphNode<T>> Parents { get; }
     new IEnumerable<IGenealogyGraphNode<T>> Children { get; }
     new IEnumerable<IGenealogyGraphNode<T>> Ancestors { get; }
     new IEnumerable<IGenealogyGraphNode<T>> Descendants { get; }
+    new T Data { get; set; }
+  }
+}

r11639	r11925
110	110	<ItemGroup>
111	111	<Compile Include="Analyzers\GenealogyAnalyzer.cs" />
	112	<Compile Include="Collections\CloneableCollection.cs" />
112	113	<Compile Include="Fragment.cs" />
113	114	<Compile Include="Interfaces\IFragment.cs" />

Note: See TracChangeset for help on using the changeset viewer.