Changeset 9419 for branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking/3.4/SymbolGraph.cs

Timestamp:

05/02/13 13:18:57 (11 years ago)

Author:

bburlacu

Message:

#1772: Refactoring of directed graph components, added code for correctly serializing vertices and edges. Added specific building blocks analyzers and new population diversity analyzer which correctly integrates with the parallel engine.

File:

• branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking/3.4/SymbolGraph.cs (modified) (3 diffs)

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking/3.4/SymbolGraph.cs

@@ -21 +21 @@
 
 using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
@@ -28 +29 @@
   [Item("Symbol graph", "A graph used to store the relationship between symbols in a population of individuals")]
   [StorableClass]
-  public class SymbolGraph : DirectedGraph<SymbolNode> {
+  public class SymbolGraph : GenericGraph<SymbolNode> {
     [Storable]
     private Dictionary<string, SymbolNode> nodes = new Dictionary<string, SymbolNode>();
@@ -58 +59 @@
     public Dictionary<int, int> Positions { get; set; }
     public double AverageArity { get; set; }
+
+    public new List<SymbolArc> InEdges {
+      get { return base.InEdges == null ? null : base.InEdges.Cast<SymbolArc>().ToList(); }
+    }
+
+    public new List<SymbolArc> OutEdges {
+      get { return base.OutEdges == null ? null : base.OutEdges.Cast<SymbolArc>().ToList(); }
+    }
+  }
+
+  public class SymbolArc : IEdge {
+    public IVertex Source { get; set; }
+    public IVertex Target { get; set; }
+    public double Weight { get; set; }
   }
 }
-